aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2018-05-15Add dissector for OsmoTRX protocolHarald Welte2-0/+265
This protocol is a non-standard, ad-hoc protocol to pass baseband GSM bursts between the modem (osmo-trx) and the encoder/decoder (osmo-bts-trx). Osmocom inherited this when forking OsmoTRX off the OpenBTS "Transceiver" program. Change-Id: I31f5071d08eff1731f1d602886e204c87eed107c
2018-05-15umts_rlc, umts_mac: fix memory leaks (found via ASAN)Ivan Nardi2-5/+4
Such leaks are triggered by malformed packets Change-Id: Ie392834b235cf9c5a249ede7fffb5a0dbdb360e5 Reviewed-on: https://code.wireshark.org/review/27556 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-15wiretap: Add a reader for files in the PEM-like format specified by RFC 7468Роман Донченко1-1/+1
Change-Id: I8109025120d01c915f3a9d5550aa9272ec83893a Reviewed-on: https://code.wireshark.org/review/27334 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2018-05-15gsm_a_dtap: fix off-by-one buffer overflow (write)Peter Wu1-1/+1
The output buffer needs one more byte for the string terminator. Bug: 14688 Change-Id: I7d606aa8fb769fd65ba894f0472ada3543a1e3cd Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6420 Reviewed-on: https://code.wireshark.org/review/27539 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-15lwm2mtlv: Add Resource name tablesStig Bjørlykke2-63/+503
Add one fixed table for OMA (Normative) defined resource names and one table for user defined resource names. All resources are identified by a object ID and a resource ID. Show number of elements in arrays instead of number of bytes. Next iteration will add proper hf entries for OMA elements. Change-Id: I4d6c053a7c448cc65692ba1d1e92a2033ff3b397 Reviewed-on: https://code.wireshark.org/review/27551 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-15CMake: require at least CMake 3.5Peter Wu2-9/+2
CMake 3.11 with the Ninja generator started complaining about CMP0058 related to ui/qt/CMakeFiles/qtui_autogen.dir/RCCstock_iconsInfo.cmake amd other files (AUTORCC). While the policy could be set explicitly, let's try to modernize the CMake configuration: - Drop CMP0042, if this gives issues with macOS, then it must be solved in a different way using non-deprecated methods. - Drop CMP0054 and ensure that all if("${foo}") and if(${foo}) are converted to if(foo). - Remove string comparison against "-NOTFOUND", it already evaluates to false in an if condition. - Use CXX_STANDARD/CXX_STANDARD_REQUIRED for Qt 5.7 and newer. - Assume that copy_if_different can accept multiple sources (CMake 3.5). - Consistency: Out of the 60 CMake 3.11 FindXxx.cmake files that use find_library, 34 contain "XXX_LIBRAR" while 16 contain "Xxx_LIBRAR". Let's assume uppercase variables (now custom MaxMindDB include dirs are correctly used). CMake 3.5 was chosen as the next version because of its wide support. Ubuntu 14.04 ships with cmake3 3.5.1, Debian jessie-backports has 3.6.2, EPEL for CentOS/RHEL6 includes cmake3 3.6.1 and SLES12 SP2 has 3.5. Change-Id: I2fa7b94bf8cc78411f414987d17bab3a33dfb360 Reviewed-on: https://code.wireshark.org/review/27444 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-14rtcp: fix buffer overflow in transport-cc dissectionPeter Wu1-12/+29
When the packet status chunks cover more packets than advertised in the packet status count field, fail rather than writing past the end. https://tools.ietf.org/html/draft-holmer-rmcat-transport-wide-cc-extensions-01#section-3.1.2 Bug: 14673 Change-Id: If90baef3610d8f884b0772a4b81d6dcb4ebc9227 Fixes: v2.5.0rc0-2533-ga584eab239 ("New RTCP dissector for transport-cc") Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6464 Reviewed-on: https://code.wireshark.org/review/27527 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Rui Zhang <rzhang@grandstream.cn> Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-14Free g_array_free-related memory leaksPeter Wu7-21/+9
g_array_free(a, FALSE) returns "a->data". Callers that do not handle this will leak memory. Convert other users to use the return value instead of direct access to "a->data". Change-Id: I0a29864e8106c0bf09e9573ef29e4474179c4171 Reviewed-on: https://code.wireshark.org/review/27438 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-14Free g_ptr_array_free-related memory leaksPeter Wu4-6/+5
g_ptr_array_free(a, FALSE) returns "a->pdata". Callers that do not handle this will leak memory (e.g. "tshark -G plugins"). Convert other users to use the return value instead of direct access to "a->pdata". Change-Id: I29835477d587f5f54bf0d94cdae9f375e3da3ce3 Reviewed-on: https://code.wireshark.org/review/27437 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-14tvbuff: make tvb_bytes_exist fail with negative valuesPeter Wu1-0/+7
tvb_generic_clone_offset_len uses tvb_bytes_exist to check that the requested tvb data is actually available. It did not expect negative values, that would result in an overly large memory allocation. Bug: 14678 Change-Id: Ie80095a381e55ca5dbbd5c9d835243549d0b212e Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7179 Reviewed-on: https://code.wireshark.org/review/27526 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-14fip: avoid tvb_bytes_exist with negative lengthPeter Wu1-1/+1
This will no longer be a valid way to check for remaining data. Change-Id: I5533b8efc3344f0f8e28d873e5363256a014ab05 Reviewed-on: https://code.wireshark.org/review/27525 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-14QUIC: fix initial_max_streams_* decoding and rename itPeter Wu2-16/+16
These are 16-bit fields, not 32-bit. Fixes a malformed packet exception. While at it, rename fields to match draft-ietf-quic-tls-11-6-g4b762033, these fields were inconssitently named in draft-11. Bug: 13881 Change-Id: I797d2b4a24a4f4a9b340db736de0000acd52e639 Reviewed-on: https://code.wireshark.org/review/27491 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-14Fix indentation.Guy Harris1-1/+1
Change-Id: Idb9344f0e08331f9e888a547bff9adf9f01334d5 Reviewed-on: https://code.wireshark.org/review/27524 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-14BGP: Validate length of Path Attribute records.Darius Davis1-1/+7
Bug 13741 showed a case where the BGP dissector's failure to validate the length of the Path Attribute record allowed a pathological BGP UPDATE packet to generate more than one million items in the protocol tree by repeatedly dissecting certain segments of the packet. It's easy enough to detect when the Path Attribute length cannot be valid, so let's do so. When the condition arises, let's raise an Expert Info error in the same style and format as used elsewhere in the same routine, and abandon dissection of the Path Attributes list. With this check in place, an incorrect length computation is revealed at a callsite. This would only have prevented a small (less than 5 bytes) Path Attribute from being dissected if it was at the very end of the Path Attributes list, but the bounds checking added in this change makes this problem much more apparent, so we fix the length computation while we're here. Testing Done: Built wireshark on Linux amd64. Using bgp.pcap from the Sample Captures page on the wiki, verified that the dissection of the UPDATE packets were unaltered by this fix. Using the capture attached to bug 13741 (clusterfuzz-testcase-minimized-6689222578667520.pcap), verified that the packet no longer triggers the "too many items" exception, instead we see an Expert Info for each oversized Path Attribute length, and eventually an exception for "length of contained item exceeds length of containing item". 30,000 iterations of fuzz test with bgp.pcap as input, and many iterations of randpkt-test too. Crafted a packet with a 3-byte ATOMIC_AGGREGATE Path Attribute at the end of the Path Attributes list; Before this change, an exception is raised during dissection, but after this change it is dissected correctly. Bug: 13741 Change-Id: I80f506b114a61e5b060d93b59bed6b94fb188b3e Reviewed-on: https://code.wireshark.org/review/27466 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>
2018-05-14Display configured checksum Expert summary stringDylan Ulis2-5/+5
Previously, checksum code would override the expert_field summary string configured by dissectors, and display the generic "Bad checksum" string in the Expert Information dialog. This change uses the configured expert_field summary string instead. eg: "CRC-S1 incorrect [should be 0xff]" instead of "Bad checksum [should be 0xff]" This fixes problem #2 in the linked bug. Bug: 14425 Change-Id: I168b2be92ec2d8d6f956beeaf6292574bc1d9dab Reviewed-on: https://code.wireshark.org/review/25758 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>
2018-05-14dns: fix null pointer deref for empty name in SRV recordPeter Wu1-3/+1
Per RFC 2782, the name should follow the "_Service._Proto.Name" format. If a malformed packet does not adhere to this and provides a zero-length name, then wmem_strsplit returns NULL. Bug: 14681 Change-Id: I7b9935238a9800a1526c8b694fd2c63d3b488d0b Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=7416 Reviewed-on: https://code.wireshark.org/review/27499 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-14proto: handle split bits covering more than 32 bitsPeter Wu1-3/+11
proto_tree_add_split_bits_item_ret_val can handle bits from an arbitrary sized buffer, as long as it covers no more than 64 bits. If the octet-aligned mask covers up to 32 bits, then this mask is also shown. If this mask was larger than 64 bits, then undefined behavior could occur, so check for that. For larger masks, instead of "= GmPRS Terminal Type: Unknown (96)", display "7 bits = GmPRS Terminal Type: Unknown (96)" instead. Bug: 13613 Change-Id: I111cf6a0705f999e42d83bfe57ac84f414946d0b Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=1158 Reviewed-on: https://code.wireshark.org/review/27517 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-14ieee80211: Conform with IEEE802.11-2016 around VHT MCS Set in VHT Capabilities.Richard Sharpe1-4/+26
There were a few undissected fields in the VHT MCS Set and some of the fields were not being placed under the correct sub tree. Change-Id: I0dc4be1b69d371f59cc74fa06205a3cba2a65c54 Reviewed-on: https://code.wireshark.org/review/27385 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-14Q.931: fix use-after-free (write) of "q931_pi"Peter Wu1-33/+27
The dissect_q931_number_ie (and indirectly dissect_q931_cause_ie_unsafe) write to the "q931_pi" structure which seems private to the q931 dissector, but can in fact be called through other dissectors (isup) as well. Normally this structure is initialized in "dissect_q931_pdu" and invalidated at the end of the function, but a malformed packet can prevent the cleanup. In the next packet, a different dissector can thus trigger a use-after-free via "dissect_q931_number_ie". Rename "dissect_q931_cause_ie_unsafe" since "unsafe" meant that external dissectors could not call it directly (see commit a83a87e9ca). Based on commit 197ceddab109, it seems that the intended purpose of the structure is to provide information to the VoIP Calls dialog, but it would only be used when called through dissect_q931_pdu. Dissectors like isup have their own routines to provide call information, but as a side-effect of code sharing the problematic code path was reached. Bug: 14689 Change-Id: I871525db560f24690ade9a0b944c6d0e655ed34b Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=6711 Reviewed-on: https://code.wireshark.org/review/27495 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-13mac-nr: check that control elements happen in the appropriate placeMartin Mathieson1-4/+31
Change-Id: I61ac442bfb7a4d81d544eec876d878eacc242239 Reviewed-on: https://code.wireshark.org/review/27501 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2018-05-13Get rid of some GTK+-only stuff.Guy Harris17-79/+61
Change-Id: I85806476246a567f747e3911e3d15716e9cfe06b Reviewed-on: https://code.wireshark.org/review/27514 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-13Get rid of some GTK+-only stuff.Guy Harris16-86/+64
Change-Id: I841a1cdb637f37673466e4d065474c0f7e2dfc56 Reviewed-on: https://code.wireshark.org/review/27512 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-13ieee80211: Fix Dead Store (Dead assignement/Dead increment) Warning found by ↵Alexis La Goutte1-1/+0
Clang Change-Id: I73bc908ab91b7e3b862efefadd6b0d7b7c064689 Reviewed-on: https://code.wireshark.org/review/27502 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-13batadv: Check checksum for full TT responsesSven Eckelmann1-7/+92
The full translation table responses for the v15 format of batman-adv contain a list of vlans and then a list of entries for these VLANs. The VLANs itself contain a checksum that is done over the entries which belong to these VLANs. The checkum must be correct or otherwise the receiver will not be able to finish its synchronization of the remote translation table. Having this information available for filtering is essential to understand such a situation and to analyze why a node continues to send full table requests. Change-Id: I90f3d3d2c19ac85c1c5a6474cf1877583cfd1139 Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/27442 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-05-13batadv: Accept Multicast TVLV v2Sven Eckelmann1-1/+1
The multicast implementation in batman-adv exists in two different versions which are incompatible. But their TVLV format for announcing the feature itself is the same and can be supported by the current dissector. Change-Id: I0e3012375912355e47adbb9d0e4f91fc7510156b Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/27443 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-05-13ieee80211: remove unused variable and fix compilationIvan Nardi1-12/+0
Fix compilation error: .../wireshark/epan/dissectors/packet-ieee80211.c:2641:27: error: ‘ht_info_service_interval_granularity_flags’ defined but not used [-Werror=unused-const-variable=] Change-Id: I0e6e8a46b2bd58923847220f675fe6e4d6a34aef Reviewed-on: https://code.wireshark.org/review/27498 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-13radiotap: Bring the HE header dissection into conformance with changes.Richard Sharpe2-29/+53
Johannes made changes in the handling of LTF Symbols and LTF Symbol count which are sort of backward compatible. This brings us into conformance with those. The specification can be found here: http://www.radiotap.org/fields/HE.html Change-Id: I82e5458fa871b42549fabd0bcb49f6366c10d8bb Reviewed-on: https://code.wireshark.org/review/27370 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-13ieee80211: Bring HT Info into conformance with IEEE802.11-2016.Richard Sharpe1-65/+46
The HT Information element has changed since IEEE802.11n. This updates that element to bring it in conformance with IEEE802.11-2016. Change-Id: Ifa380b9a4dee00e0b2f07f5aabb6a18579aa8f71 Reviewed-on: https://code.wireshark.org/review/27371 Petri-Dish: Richard Sharpe <realrichardsharpe@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-13coap: fix use-after-free of "coinfo->ctype_str"Peter Wu1-1/+1
A use-after-free is possible through the following path: // returns wmem_packet_scope() memory coinfo->ctype_str = val_to_str(coinfo->ctype_value, vals_ctype, "Unknown Type %u"); // leaks packet scoped memory into conversation coap_trans = wmem_new0(wmem_file_scope(), coap_transaction); coap_trans->req_ctype_str = coinfo->ctype_str; // <-- oops // next packet: use-after-free of packet scoped memory coinfo->ctype_str = coap_trans->req_ctype_str; This could be fixed by duplicating "ctype_str" with wmem_file_scope, but since all "ctype_str" strings are constant, make the problematic "ctype_str" assignment also constant for unknown types (the numeric type is also stored in "ctype_value" if necessary). Change-Id: I6249e076fa282bbe0982b8c709788e27f6fdf86e Fixes: v2.9.0rc0-317-g46fcf452ac ("coap: Store ctype values in transaction tracking") Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=8196 Reviewed-on: https://code.wireshark.org/review/27477 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-12Get rid of some GTK+-only stuff.Guy Harris2-20/+4
Change-Id: I6c14429d4d473464ad7bea18dee07c3adf34664d Reviewed-on: https://code.wireshark.org/review/27479 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-12Get rid of GTK+-only structure member.Guy Harris1-1/+0
Change-Id: I93e1a44ff3b22ba6ff0c14853e78c935347ed290 Reviewed-on: https://code.wireshark.org/review/27478 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-12batadv: Fix label for batadv.unicast_tvlv.srcSven Eckelmann1-1/+1
Change-Id: I73c06bb84efc874412b534348b9d1261b8ed5164 Fixes: v1.99.1rc0-546-g4cc4315793 ("batadv: Add dissector support for batadv v15") Signed-off-by: Sven Eckelmann <sven@narfation.org> Reviewed-on: https://code.wireshark.org/review/27440 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: Dario Lombardo <lomato@gmail.com>
2018-05-12gsm_a_gm: fix potential buffer overrun (read)Peter Wu1-3/+5
When the string "str" is empty, "str+1" is invalid. This function can be called from functions using SET_ELEM_VARS in packet-gsm_a_common.c which appear to check the length first, but packet-etsi_card_app_toolkit.c and packet-camel.c do not. Err on the safe side and do not add the item. Change-Id: I6bd559593bb10ff0b8bf08a48d828613e3d8ccf5 Link: https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=4311 Reviewed-on: https://code.wireshark.org/review/27470 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-12bluecom: remove dead stores/increments (found by clang).Dario Lombardo1-4/+0
Change-Id: I07475225ca2e81ba22d0669a7ef474d76b46e2cb Reviewed-on: https://code.wireshark.org/review/27445 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2018-05-12rtmpt: fix dissection of multiple packets on second passPeter Wu1-4/+6
The previous fix for the infinite loop in bug 13347 resulted in loop termination after one round, resulting in ignoring all but the last packet in a TCP segment. Observe that the purpose of this loop is to collect all packets where "tp->seq" refers to the first offset and "tcp->lastseq" refers to the last position of the packet. If a full packet "tp" is found, then the previous packet ends at "tp->seq-1" instead of "tp->lastseq-1" (assuming no overlapping TCP segments). The infinite loop from bug 13347 occured because of a single packet of length 1 (tp->seq=0, tp->lastseq=0) and lastseq-1 overflowed. To address that, terminate the loop once the begin is reached (tp->seq == 0). Bug: 14650 Change-Id: Ibef382a09c6481b1024dd64dbc8bde904025f057 Fixes: v2.3.0rc0-2153-gee185445f4 ("rtmpt: Ensure sequence count is incremented for stored fragments") Reviewed-on: https://code.wireshark.org/review/27319 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-12CIP Motion: Various UpdatesDylan Ulis2-127/+194
1. Feedback Mode: Should only use the lower 4 bits. 2. Axis Response: Add more enumerated values 3. Axis Status: Add more bit interpretations 4. Add more Motion Attributes 5. Minor cleanup Change-Id: I0a6568ca263afb8d7827961907cb7d0a42b376f4 Reviewed-on: https://code.wireshark.org/review/27400 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-11CIP: Data Type updatesDylan Ulis1-53/+49
1. Convert lots of things to use the new BASE_UNIT_STRING feature 2. ANSI Symbol: Print size correctly in generated response 3. Attribute Status is a 1 byte value in Get/Set_Attribute_Lists 4. Forward Open: Indicate this is a Safety connection in info column. This is useful because Safety connections aren't obvious from the CIP Class like other connections (eg: Motion) Change-Id: I8cb00fd0141d75a3e9425d8e618b1f54d12807be Reviewed-on: https://code.wireshark.org/review/27447 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-11MAC LTE: fix mac-lte.slsch.format fieldPascal Quantin1-2/+2
Bug: 14669 Change-Id: I7326046e3707867d7dfef2e4eb341c95f1b2cdab Reviewed-on: https://code.wireshark.org/review/27461 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2018-05-10DisplayPort AUX channel protocol dissectorDirk Eibach4-0/+688
Dissector for the VESA DisplayPort AUX channel protocol. Bug: 14651 Change-Id: I5c0c7668bda969086d9d6e5069aad87e929f6340 Reviewed-on: https://code.wireshark.org/review/27311 Reviewed-by: Dario Lombardo <lomato@gmail.com> Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-10wslua: fix memleak in Dir.remove_all on error pathPeter Wu1-3/+2
While at it, use g_build_filename. Found by Clang Static Analyzer. Change-Id: I5c50f50abb8c16a553586c548ccd1ae6c3cdd8c1 Reviewed-on: https://code.wireshark.org/review/27439 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-09fp: Avoid changes to info column after payload dissectionSayuri Mizushima1-3/+2
Previously info was appended to the end of the info set by an underlying protocol (mostly rlc/rrc) Change-Id: I7fe0d8d485f81ed2c108099e76d15c887108164f Reviewed-on: https://code.wireshark.org/review/27399 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-09fp: Fix incorrect framingSayuri Mizushima1-0/+29
A rare case was matching against both dch and pch checks Change-Id: I1aa01636355a6fb5d0804b184f3f9b58bec99ffd Reviewed-on: https://code.wireshark.org/review/27367 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-09nas_5gs: remove legacy return (CID: 1435476).Dario Lombardo1-2/+0
Change-Id: I99be7b1431f564a147ee3f9090ce93792ecf2b1f Reviewed-on: https://code.wireshark.org/review/27430 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-05-09zbee-zcl-general: fix typo (CID 1435473).Dario Lombardo1-1/+1
Change-Id: I9a5d06c991c6c0f0b8e89f27cf9e06b8df77f44e Reviewed-on: https://code.wireshark.org/review/27429 Petri-Dish: Dario Lombardo <lomato@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09packet-ieee80211: fix infinite loop (CID 1435463).Dario Lombardo1-1/+2
Change-Id: I1eee5cc0fa87a6add901f4e86b13e1f4564134cd Reviewed-on: https://code.wireshark.org/review/27423 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Peter Wu <peter@lekensteyn.nl>
2018-05-09proto: don't overrun buffer.Dario Lombardo1-1/+1
This is shown by a bunch of coverity reports all pointing at this line. Every buffer has a ITEM_LABEL_LENGTH, but label_mark_truncated access it at ITEM_LABEL_LENGTH (off-by-one). CIDs: 1435461 1435462 1435465 1435466 1435471 1435472 1435477 1435481 1435483 1435484 1435485 1435489 1435492 1435500 Fixes: v1.11.3-rc1-1837-gf94674d2fb ("truncate UTF-8 strings only at the boundary between two characters") Change-Id: I3781c36594f7db880bc9f76b64d261dbc498c0ce Reviewed-on: https://code.wireshark.org/review/27425 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: Dario Lombardo <lomato@gmail.com>
2018-05-09You have to set tm_isdst before calling mktime().Guy Harris1-0/+1
You either need to tell mktime() that 1) DST/Summer Time is in effect, 2) DST/Summer Time isn't in effect, or 3) we don't know whether DST/Summer Time is in effect, you figure it out. We set tm_isdst to -1, to choose option 3), which is what we want. Fixes Coverity CID 1435496. Change-Id: Iff24e51807ab42c0e6d9629f72848ad9f8d325fb Reviewed-on: https://code.wireshark.org/review/27404 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-09Fix infinite loop.Guy Harris1-0/+1
If a variable is a count of items, and we're looping while the count is non-zero, we need to decrement it after every item we process. Fixes Coverity CID 1435501. Change-Id: Iabb0cb6276d4bcf4b1bdea9ec3ba943dac1b9938 Reviewed-on: https://code.wireshark.org/review/27402 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2018-05-09smb: fix memleak in export objectsPeter Wu1-3/+3
"aux_smb_fid_type_string" is used as "%s" argument for g_strdup_printf, there is no need to clone it. I checked all calls and "fid_type" should always be valid, but in case of a bug, let's not return a NULL pointer but "?". Found by Clang Static Analyzer. Change-Id: I09896638eb5512f22b3d1a227462499e12cedcde Reviewed-on: https://code.wireshark.org/review/27349 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot Reviewed-by: ronnie sahlberg <ronniesahlberg@gmail.com>
2018-05-08dtls: Remove period from Version blurbStig Bjørlykke1-1/+1
Change-Id: I5e50554daf25d2b2e71795c28e393f08d117ad6f Reviewed-on: https://code.wireshark.org/review/27396 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>