aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2017-10-12FTP: setup conversation properly for PASV sessionsMartin Mathieson1-36/+42
Also keep track of last frame of data response, and work out duration of ftp-data stream. Change-Id: I460aaa5c8736e044410eab428707651cede39d7e Reviewed-on: https://code.wireshark.org/review/23880 Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2017-10-12IEEE 802.11: fix a segmentation fault introduced in gd6eda2a3Pascal Quantin1-1/+2
Bug: 14114 Change-Id: Ie377b1b3ccf29014935b9e5796567cdb8bb466a3 Reviewed-on: https://code.wireshark.org/review/23893 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-12[TCAP] Make "tid" a generated item rather than hidden to make it obviousAndersBroman2-4/+4
that it exists. Change-Id: I1986b7678193f3b4c9ed8cabff7e411cef5bf185 Reviewed-on: https://code.wireshark.org/review/23892 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-12infiniband: add PSN and RETH DMA length to infinibandinfo structJorge Mora2-8/+10
Expose the PSN (packet sequence number) and the RETH DMA length to protocol's dissectors. Change-Id: Ied53a8964d7cd5c3d148ec7c7642017951e56118 Reviewed-on: https://code.wireshark.org/review/23886 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-11IEEE 802.11: add missing breaksPascal Quantin1-0/+6
Change-Id: Ie26b0c869a778f7e27cb6d944c2e32ced0d3337e Reviewed-on: https://code.wireshark.org/review/23889 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-11ProtoBuf: Remove an unused variable.Gerald Combs1-9/+1
Remove protobuf_message_direction_type: ../epan/dissectors/packet-protobuf.c:125:20: error: unused variable 'protobuf_message_direction_type' [-Werror,-Wunused-const-variable] VALUE_STRING_ARRAY(protobuf_message_direction_type); ^ Have dissect_one_protobuf_field return a gboolean while we're here. Change-Id: I5d9d2e3414b5668ca26d5c0a450225c3cdf5da56 Reviewed-on: https://code.wireshark.org/review/23887 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2017-10-11Decode SNR in Compressed MIMO Beamforming report per ieee80211at_2013 ↵Jason Uher1-8/+30
sections 8.4.1.{29,48} Change-Id: I4f3af7e06169461a15507ed8ecce8f15075b9667 Reviewed-on: https://code.wireshark.org/review/23835 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-11[Solaredge] Fix SuSE 11.4 build packet-solaredge.c:1013: error:AndersBroman1-7/+7
declaration of rand shadows a global declaration Change-Id: I98f4edb14cd241bd709d50e8ac9151448773a658 Reviewed-on: https://code.wireshark.org/review/23884 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-10Start of adding Protobuf (Protocol Buffers) dissector.Huang Qiangxiong4-0/+762
1. Protobuf dissector supports the almost all basic protobuf types of varint, sint, string, and so on. 2. Protobuf messages are not self-described protocol, for example, varint in protobuf may be int32, int64, uint32, uint64, sint32, sint64, bool or enum. Currently dissector will dissect field without detail definition in common way, for numeric field it show uint32 or uint64, for length-delimited field it just show as bytes. But user turn the try_dissect_all_length_delimited_field_as_string or show_all_possible_field_types options on, that dissect will show all possible value for each field according to wire type. (for example, a numeric field will parsed in int32, uint32, sint32, sint64 and so on). Ping-Bug: 13932 Change-Id: Idfe49307b1c84fe461603756f75daeb3e410a905 Reviewed-on: https://code.wireshark.org/review/23814 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-10[GSM SMS] If the digits are E164 International number add an E.164AndersBroman1-1/+11
filter. Change-Id: Idcfa53d1db9e9f7b5501ca92592fb0fa0790ffe9 Reviewed-on: https://code.wireshark.org/review/23873 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-10Change FI_VARINT to account for FI_BITS_XXX flagsMichael Mann1-2/+2
FI_BITS_XXX were using bits 5-15 of the field_info->flags bitmask. Move FI_VARINT to be outside of that range. Change-Id: I92efcb5644cdbb562537d2813b611e583315874b Reviewed-on: https://code.wireshark.org/review/23871 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-10[gvcp] fix extendedblockids check and resend cmd parsingFelix Ruess1-3/+3
Change-Id: I9e0314ae2e975a1c50cfaf2b00e469ad7f640357 Reviewed-on: https://code.wireshark.org/review/23866 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-09infiniband: fix OpCodeMap string for UC_RDMA_WRITE_MIDDLEJorge Mora1-5/+1
Make string mapping for UC_RDMA_WRITE_MIDDLE consistent with all other mappings in the OpCodeMap table. Remove extra blank lines in the OpCodeMap table. Change-Id: Ifb3e242a89458103f3db3b5718d5d939dffb6dae Reviewed-on: https://code.wireshark.org/review/23867 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-09[Diameter 3GPP] Fix bitmask in feature list B26 and add B27.AndersBroman1-3/+11
Change-Id: I0f035da3f5305ce6935c79e0c1b5f63f955d099d Reviewed-on: https://code.wireshark.org/review/23865 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-09Add ENC_VARINT_PROTOBUFMichael Mann5-41/+376
Encoding of integer datatypes of Protocol buffers https://developers.google.cn/protocol-buffers/docs/encoding Change-Id: I9f6d65ddca099c15c0634984e9394131f98d35a9 Reviewed-on: https://code.wireshark.org/review/23813 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-09packet.c: fix a control flow issue reported by Coverity (CID 1418671)Pascal Quantin1-6/+6
Let's perform the check before potentially breaking the loop. While we are at it, let's update the test to remove the last layer so as to match the one used to add it. Change-Id: I5807219de75c4e2c23b9435d6271ad60aec45783 Reviewed-on: https://code.wireshark.org/review/23844 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-08ftypes(.h): fix indent (use tabs)Alexis La Goutte1-15/+15
Change-Id: Ic824910d4ec8c9987e8deec8d61809feb9849b9b Reviewed-on: https://code.wireshark.org/review/23863 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-08proto(.h): fix indent (use spaces)Alexis La Goutte1-2/+2
Change-Id: I029a9db40c8ca5a67bb1db69c50d8f08b7f59ab2 Reviewed-on: https://code.wireshark.org/review/23864 Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-07X2AP: fill gaps in extended value string arrayPascal Quantin2-0/+12
Change-Id: I6d8594de78dd46d679072cc17211e940155f0012 Reviewed-on: https://code.wireshark.org/review/23858 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-07S1AP: upgrade dissector to v14.4.0Pascal Quantin9-15/+25
Change-Id: I1124a691ec004507e6e144038b13f9d432d88c5f Reviewed-on: https://code.wireshark.org/review/23857 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-06RPC-over-RDMA: fix write list chunk countJorge Mora1-0/+1
Add the chunk_size to the offset to get the correct write list count, this issue was introduced by the fix for Bug: 13558 Change-Id: I306a9c0c9d601f7bdf4cc0e49eacd5466a6adb89 Reviewed-on: https://code.wireshark.org/review/23851 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05M3AP: avoid appending m3ap multiple times to frame.protocols fieldPascal Quantin2-10/+10
Change-Id: Iff7cc711ae1fba0a7c239dec47d83d5b4ac84e2c Reviewed-on: https://code.wireshark.org/review/23849 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05M2AP: avoid appending m2ap multiple times to frame.protocols fieldPascal Quantin2-10/+10
Change-Id: I4e9fee5ae98cd776d168006c4119aff5767dfa16 Reviewed-on: https://code.wireshark.org/review/23848 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05LPPa: avoid appending lppa multiple times to frame.protocols fieldPascal Quantin2-8/+8
Change-Id: I89557fc4ee5bce4802cc2b34e020d567ab34c79b Reviewed-on: https://code.wireshark.org/review/23847 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05X2AP: avoid appending x2ap multiple times to frame.protocols fieldPascal Quantin2-10/+10
Change-Id: I521ffa43ff81b9a41f8e3f01a0d39e18f590a050 Reviewed-on: https://code.wireshark.org/review/23846 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05S1AP: avoid appending s1ap multiple times to frame.protocols fieldPascal Quantin2-10/+10
Change-Id: Ide44391bf18d2f301f32cd6a65b246e9a1cc5891 Reviewed-on: https://code.wireshark.org/review/23845 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05gRPC: Several bugfixesVladimir Rutsky1-3/+3
1. fix returing new offset value dissect_grpc_message() is called with the offset to the message that needs to be parsed and returns new offset (e.g. offset to the next message in stream). Before this change length of the parsed message (including 5 bytes header) were returned which was incorrect and may lead to infinite loops. 2. fix reported length in case of invalid packet 3. fix typo in comment: "streaam" Change-Id: I577cdcc0203a87122a4d8d8c660f43295609e8aa Signed-off-by: Vladimir Rutsky <rutsky@google.com> Reviewed-on: https://code.wireshark.org/review/23843 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-05HTTP: Add http.file_data based on the captured length.Gerald Combs1-8/+8
Switch the file_data handling to use the captured length. In a test capture here this lets us call the GIF dissector in a truncated packet. Fixup a variable type and some whitespace. Change-Id: I21b64519ad84f730e1412115035125c2bf1f361c Reviewed-on: https://code.wireshark.org/review/23838 Reviewed-by: Gerald Combs <gerald@wireshark.org> Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04gsm_sim: fix conflicting entry in its value_stringAlexis La Goutte1-9/+0
Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 24384 is at indices 72 (DF.EIA/TIA-533) and 78 (DF.WLAN)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28421 is at indices 31 (EF.LP) and 80 (EF.LI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28472 is at indices 37 (EF.SST) and 89 (EF.USI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28481 is at indices 41 (EF.PUCT) and 96 (EF.PUCI)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28489 is at indices 23 (EF.SDN) and 103 (EF.SIN)) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28494 is at indices 28 (EF.EXT4) and 107 (EF.EXT5) Field 'File ID' (gsm_sim.file_id) has a conflicting entry in its value_string: 28495 is at indices 29 (EF.ECCP) and 108 (EF.CCP2)) Change-Id: I4bde0cc644131e9b088fca07837fa1b909f30f44 Reviewed-on: https://code.wireshark.org/review/21381 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04Qt: add preference to restore display filter after Follow Streamcheloftus2-0/+7
Added new user preference 'restore_filter_after_following_stream', defaults to false. When true, the current display filter is restored after following a stream. Change-Id: I153107761003658c6d7f1464711da7b3adeb60a8 Reviewed-on: https://code.wireshark.org/review/22455 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04Instroduce col_finalize(), to allow creating column_info based not only on ↵Jakub Zawadzki2-11/+30
preferences. Change-Id: I417e6accff3390a9b1839cd6b44266b76aa754c3 Reviewed-on: https://code.wireshark.org/review/23767 Petri-Dish: Jakub Zawadzki <darkjames-ws@darkjames.pl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-04TLS: enable OCSP status dissection for TLS 1.3 and DTLSPeter Wu4-144/+181
In TLS 1.2, the "certificate_status" extension in the CH would result in a response in the CertificateStatus handshake message. In TLS 1.3, the response appears in a SH extension instead. Refactor the code to use ssl_add_vector and hook it up with SH extensions dissection. Do not stop dissection on a non-empty Responder ID list. Remove misleading "CertificateStatus" tree item, it only covered the "OCSPResponse" vector, now its two children (just OCSP Response Length and the OCSP Response tree) are displayed directly. Enable DTLS support, the spec does not forbid it and there is a user: https://mta.openssl.org/pipermail/openssl-users/2016-August/004306.html Tested with tls-sct.pcap (bug 13372) which now shows one tree item less and tls13-18-cert-sct-ocsp.pcap (bug 12779) which now dissects the OCSP response in the Certificate Extensions. Change-Id: I2ccde84cb1e3bcb1bc47676eadc5cb542248cd92 Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/23819 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-03E.212: update list to Operational Bulletin No. 1133 (1.X.2017)Pascal Quantin1-14/+29
Change-Id: I954d18107a5743f148388cc2356458aeddca162f Reviewed-on: https://code.wireshark.org/review/23828 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-03conversation_table: Export all functions for external plugin useGregor Jasny1-7/+7
Change-Id: I5e42ceb5013a9ec629845953051cdeaf8b94112d Reviewed-on: https://code.wireshark.org/review/23821 Reviewed-by: João Valverde <j@v6e.pt> Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-03infiniband: fix ISO C does not allow extra ‘;’ outside of a function ↵Alexis La Goutte1-1/+1
[-Wpedantic] Change-Id: I892e7a92c231293f1977cba4513b49afda8c676c Reviewed-on: https://code.wireshark.org/review/23823 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-03nfs: fix typo on new xattrs attributAlexis La Goutte1-6/+6
Change-Id: I4872334e73df8a71690400e7f0690eecc02d8270 Reviewed-on: https://code.wireshark.org/review/23820 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-03nfs4: Add ACCESS_MASK support for xattrsTom Haynes2-26/+89
See: https://datatracker.ietf.org/doc/draft-ietf-nfsv4-xattrs/ Change-Id: Ia9238bf96562f95eb56d25a1f8051b4e4fca5ba4 Signed-off-by: Tom Haynes <loghyr@primarydata.com> Reviewed-on: https://code.wireshark.org/review/23817 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-03TLS13: fix SCT dissection since draft -17Peter Wu1-2/+8
Since draft -17, SCT has moved from EE to Certificate extensions. Decryption failed for a boringssl test suite capture because it tests with an unknown version and a small SerializedSCT which resulted in a malformed packet exception. Ignore the SCT following RFC 6962, sect 3.3. Change-Id: I894d51447f28ca121ea7f3fcef2b711a0debc1fb Ping-Bug: 12779 Reviewed-on: https://code.wireshark.org/review/23818 Petri-Dish: Peter Wu <peter@lekensteyn.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02GTPv2: fix out of bounds access when decoding Private Extension IEPascal Quantin1-2/+2
Bug: 14095 Change-Id: I85e481be269ee3103209668e2c924faef6f5b1ec Reviewed-on: https://code.wireshark.org/review/23816 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-02HTTP: fix for ICY responses which were displayed as HTTP requestsEugene Adell1-5/+2
Bug: 14091 Change-Id: Ic8d37e29f02dc9751c60e827aa773d915cabc088 Reviewed-on: https://code.wireshark.org/review/23802 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-02QUIC: rename Stream ID Needed by Stream ID Blocked (draft-06)Alexis La Goutte1-4/+4
Change-Id: I9aba424fc9df5030befac31373dc759249d936c5 Reviewed-on: https://code.wireshark.org/review/23810 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02QUIC: Add draft-06 version (value_string)Alexis La Goutte1-0/+1
Change-Id: Iabfa1045a7c8db3b154a9f827f2a2f130bb4fae4 Reviewed-on: https://code.wireshark.org/review/23809 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02ZCL Events Dissector: Increase number of subtreesMartin Boye Petersen1-4/+3
Increase number of subtrees for PublishEventLog so we can dissect the 100 event logs that are specified as the maximum in the Great Britain Companion Specification (GBCS). Change-Id: I23b1729abd58168772e1937e1f52552fab2187a7 Reviewed-on: https://code.wireshark.org/review/23782 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02btle: Add preference to detect retransmissionStig Bjørlykke1-20/+31
In cases with missing frames, frames with incorrect CRC or unknown direction it must be possible to turn off detecting retransmissions. Change-Id: Ia5a1194004f768986b939b4195a21c6e7a2ac4c8 Reviewed-on: https://code.wireshark.org/review/23803 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02Tshark: Prepare Elasticsearch output deduplicationChristoph Wurm1-189/+247
Refactors the ES output to use hash tables and lists in preparation of deduplicating fields. ES 5.x allows those, but will only store the last instance and discard any other without warning. ES 6.x altogether refuses to accept documents containing duplicate fields. This change should not change the output of Tshark in any way. A subsequent change will introduce the actual deduplication. Bug: 12958 Change-Id: I329ef0878e33b42d65a53bcac977429d87cde3ca Reviewed-on: https://code.wireshark.org/review/23042 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02Dissector: SolarEdge inverter monitoring protocolErik de Jong6-0/+1709
Adds support for the SolarEdge inverter monitoring protocol. Based on the work done by https://github.com/jbuehl/solaredge bug: 14079 Change-Id: Ia0102c057e4cd27c187b01c7fd28053678f22727 Reviewed-on: https://code.wireshark.org/review/23653 Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02FP: Add heuristic FACH 1 dissectorDarien Spencer1-3/+116
Note that FACH 1 and FACH 2 are official terms as documented in TS 25.944 Change-Id: I1afbd99d5603df442dce903ad08ba071961f0586 Reviewed-on: https://code.wireshark.org/review/23785 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)João Valverde1-3/+0
... not to be confused with "machine-to-machine". M2M seems to be a simple Wimax encapsulation protocol developed by Intel. It's not documented publicly anywhere that I can find. The boilerplate to code ratio is huge and it even includes a complete source file from the Wimax dissector (yuck). Put it in the Wimax plugin instead. Minor version number bump for wimax plugin. Change-Id: I2694339dfe89be334093b257a5b34d1577f4dc20 Reviewed-on: https://code.wireshark.org/review/23790 Petri-Dish: João Valverde <j@v6e.pt> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-01stats tree: (trivial) reformat assignmentsMartin Kaiser1-24/+24
a= b; looks a bit strange. Replace such assignments with a = b; Change-Id: I09534e0201906490daeb5cd35c55df00e139cf30 Reviewed-on: https://code.wireshark.org/review/23800 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-01stats_tree: fix the comparison routine for COL_AVERAGEMartin Kaiser1-11/+3
Generally, the average is calculated as node->total / node->count. The curent code does not handle the case where we compare two nodes and both have count == 0. It defines one of the nodes to be bigger. This triggers (at least on Windows) an assertion about invalid operator<. To fix this, we define average = 0 for a node with count == 0. We can then simply compare the two averages. Change-Id: Ie7d9cd590deddcdb9214c4a2693c2eb47c66b287 Reviewed-on: https://code.wireshark.org/review/23799 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Petri-Dish: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-01 08:48:04 +0000