Commit Graph

35386 Commits

Author SHA1 Message Date
Pascal Quantin 5ad0579beb IEEE 802.11: fix a segmentation fault introduced in gd6eda2a3
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 11:43:36 +00:00
AndersBroman 2a8ab239bd [TCAP] Make "tid" a generated item rather than hidden to make it obvious
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-12 11:43:26 +00:00
Jorge Mora da8dbd2471 infiniband: add PSN and RETH DMA length to infinibandinfo struct
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-12 01:45:12 +00:00
Pascal Quantin b363e46ad4 IEEE 802.11: add missing breaks
Change-Id: Ie26b0c869a778f7e27cb6d944c2e32ced0d3337e
Reviewed-on: https://code.wireshark.org/review/23889
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-11 19:37:20 +00:00
Gerald Combs b2467fddb1 ProtoBuf: Remove an unused variable.
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-11 16:31:21 +00:00
Jason Uher 95c50e3dd7 Decode SNR in Compressed MIMO Beamforming report per ieee80211at_2013 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 11:28:27 +00:00
AndersBroman 6ef693dec1 [Solaredge] Fix SuSE 11.4 build packet-solaredge.c:1013: error:
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-11 11:15:47 +00:00
Huang Qiangxiong 8fbad3dd56 Start of adding Protobuf (Protocol Buffers) dissector.
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 23:45:15 +00:00
AndersBroman 3444d41fd0 [GSM SMS] If the digits are E164 International number add an E.164
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-10 11:20:10 +00:00
Michael Mann 698aa24165 Change FI_VARINT to account for FI_BITS_XXX flags
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 11:19:19 +00:00
Felix Ruess 6b466a9e4f [gvcp] fix extendedblockids check and resend cmd parsing
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-10 08:23:27 +00:00
Jorge Mora 95ce7daf65 infiniband: fix OpCodeMap string for UC_RDMA_WRITE_MIDDLE
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 19:32:09 +00:00
AndersBroman 3bfb9aabe0 [Diameter 3GPP] Fix bitmask in feature list B26 and add B27.
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-09 11:46:10 +00:00
Michael Mann d8d60b4980 Add ENC_VARINT_PROTOBUF
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-09 11:31:19 +00:00
Pascal Quantin c6a0e2a791 packet.c: fix a control flow issue reported by Coverity (CID 1418671)
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-09 04:35:28 +00:00
Alexis La Goutte 1df866d99e ftypes(.h): fix indent (use tabs)
Change-Id: Ic824910d4ec8c9987e8deec8d61809feb9849b9b
Reviewed-on: https://code.wireshark.org/review/23863
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-08 13:31:38 +00:00
Alexis La Goutte 14107eec71 proto(.h): fix indent (use spaces)
Change-Id: I029a9db40c8ca5a67bb1db69c50d8f08b7f59ab2
Reviewed-on: https://code.wireshark.org/review/23864
Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-10-08 13:30:54 +00:00
Pascal Quantin ddb754243e X2AP: fill gaps in extended value string array
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-07 21:37:04 +00:00
Pascal Quantin eb5b2a211d S1AP: upgrade dissector to v14.4.0
Change-Id: I1124a691ec004507e6e144038b13f9d432d88c5f
Reviewed-on: https://code.wireshark.org/review/23857
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-07 21:36:54 +00:00
Jorge Mora 53706c80d6 RPC-over-RDMA: fix write list chunk count
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-06 18:00:17 +00:00
Pascal Quantin ae794fc5f2 M3AP: avoid appending m3ap multiple times to frame.protocols field
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-05 21:23:35 +00:00
Pascal Quantin fa8fd247cf M2AP: avoid appending m2ap multiple times to frame.protocols field
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-05 21:23:27 +00:00
Pascal Quantin 0a4c646cbc LPPa: avoid appending lppa multiple times to frame.protocols field
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-05 21:23:20 +00:00
Pascal Quantin 155f8d5288 X2AP: avoid appending x2ap multiple times to frame.protocols field
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-05 21:23:13 +00:00
Pascal Quantin 82acd85bcc S1AP: avoid appending s1ap multiple times to frame.protocols field
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-05 21:23:04 +00:00
Vladimir Rutsky 561914bd20 gRPC: Several bugfixes
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-05 16:18:27 +00:00
Gerald Combs 7219f6467f HTTP: Add http.file_data based on the captured length.
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-05 04:16:14 +00:00
Alexis La Goutte 8804ddbe2a gsm_sim: fix conflicting entry in its value_string
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-04 14:07:34 +00:00
cheloftus 70996dc669 Qt: add preference to restore display filter after Follow Stream
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-04 03:59:38 +00:00
Jakub Zawadzki 0553cda6da Instroduce col_finalize(), to allow creating column_info based not only on 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-04 03:48:12 +00:00
Peter Wu 3cddb369d5 TLS: enable OCSP status dissection for TLS 1.3 and DTLS
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-04 03:40:16 +00:00
Pascal Quantin 2c89e6c448 E.212: update list to Operational Bulletin No. 1133 (1.X.2017)
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-03 20:53:53 +00:00
Gregor Jasny c09c6531ba conversation_table: Export all functions for external plugin use
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-03 11:21:21 +00:00
Alexis La Goutte 27c7aa38aa infiniband: fix ISO C does not allow extra ‘;’ outside of a function [-Wpedantic]
Change-Id: I892e7a92c231293f1977cba4513b49afda8c676c
Reviewed-on: https://code.wireshark.org/review/23823
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-03 10:53:27 +00:00
Alexis La Goutte d477ea35a9 nfs: fix typo on new xattrs attribut
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-03 06:34:32 +00:00
Tom Haynes 5d672c469d nfs4: Add ACCESS_MASK support for xattrs
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-03 04:33:12 +00:00
Peter Wu e670f9c80b TLS13: fix SCT dissection since draft -17
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-03 03:46:00 +00:00
Pascal Quantin 83cb6ff625 GTPv2: fix out of bounds access when decoding Private Extension IE
Bug: 14095
Change-Id: I85e481be269ee3103209668e2c924faef6f5b1ec
Reviewed-on: https://code.wireshark.org/review/23816
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2017-10-02 20:39:37 +00:00
Eugene Adell 96c07c6471 HTTP: fix for ICY responses which were displayed as HTTP requests
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-02 17:48:11 +00:00
Alexis La Goutte ab01a1eab1 QUIC: rename Stream ID Needed by Stream ID Blocked (draft-06)
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-02 08:06:20 +00:00
Alexis La Goutte 06548c905e QUIC: Add draft-06 version (value_string)
Change-Id: Iabfa1045a7c8db3b154a9f827f2a2f130bb4fae4
Reviewed-on: https://code.wireshark.org/review/23809
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-10-02 08:05:33 +00:00
Martin Boye Petersen 6a083c1256 ZCL Events Dissector: Increase number of subtrees
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-02 05:48:08 +00:00
Stig Bjørlykke e3ea990450 btle: Add preference to detect retransmission
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-02 04:32:15 +00:00
Christoph Wurm 1f8e7c45e1 Tshark: Prepare Elasticsearch output deduplication
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-02 04:17:31 +00:00
Erik de Jong ed49b3dcfe Dissector: SolarEdge inverter monitoring protocol
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-02 04:14:31 +00:00
Darien Spencer f54d07b019 FP: Add heuristic FACH 1 dissector
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-02 04:12:48 +00:00
João Valverde 6e24d5f690 Unsplit "m2m" plugin (wimax mac-to-mac encapsulation)
... 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-01 16:05:05 +00:00
Martin Kaiser e155e91599 stats tree: (trivial) reformat assignments
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-01 15:11:51 +00:00
Martin Kaiser 9ab17810bc stats_tree: fix the comparison routine for COL_AVERAGE
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>
2017-10-01 15:11:10 +00:00
Martin Kaiser d8903ce397 simplify some include file paths
For both autotools and cmake, the top-level source directory is always
part of the search path for include files. For include files in this
directory, we can simply use the file name. There's no need for a
relative path.

Change-Id: Ibf46265d91b5cb9bff4fa791e5b1d69ee3c1e165
Reviewed-on: https://code.wireshark.org/review/23798
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-01 15:10:19 +00:00