Commit Graph

22838 Commits

Author SHA1 Message Date
AndersBroman aaf347c029 Remove deprecated API tvb_lengtRemove deprecated API tvb_length
Change-Id: Iea7dd7d13ce1a2ee375a2c4a75f897ba2c936921
Reviewed-on: https://code.wireshark.org/review/8048
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-13 10:17:47 +00:00
AndersBroman 1785d42061 Remove depricated API tvb_length -> tvb_reported_length
Change-Id: I78b1d2accf4fd0b37eaa16cb8bf515422565e98a
Reviewed-on: https://code.wireshark.org/review/8011
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-10 13:19:33 +00:00
Alexis La Goutte 8c0f09e5b7 MIP6: Remove proto_tree_add_text
Based on packet-ip.c

Change-Id: Ibc561b58d5f4b3e3469e1c578e83b3abe3c206f8
Reviewed-on: https://code.wireshark.org/review/8008
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-10 03:27:35 +00:00
Alexis La Goutte 93169cb495 OCFS2: fix some GCC / Clang warnings
packet-ocfs2.c:249: comma at end of enumerator list [-Wpedantic]
packet-ocfs2.c:1171: no previous prototype for 'proto_register_ocfs2' [-Wmissing-prototypes]
packet-ocfs2.c:1651: no previous prototype for 'proto_reg_handoff_ocfs2' [-Wmissing-prototypes]
packet-ocfs2.c:1678:4: no newline at end of file [-Wnewline-eof]

Remove also unneed glib.h include

Change-Id: I47a03dbc9f175a0e2453dd90a733144ac9f95fc4
Reviewed-on: https://code.wireshark.org/review/8007
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 20:44:30 +00:00
AndersBroman c2a1d8feed Replace deprecated API tvb_length -> tvb_reported_length
Change-Id: I9c8bf6beec47afb901e492723b335a28a24f455e
Reviewed-on: https://code.wireshark.org/review/8004
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:38:04 +00:00
AndersBroman 5fa267e870 REplace deprecated API tvb_length -> tvb_reported_length
Change-Id: I6090055a9c31f6787626b810de655d1cc71b99de
Reviewed-on: https://code.wireshark.org/review/8002
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 12:03:23 +00:00
Alexis La Goutte db92f393d8 802.11: use switch for Aruba type
Change-Id: I7f0f10ca695fedab613156811fac60e5fa015bee
Reviewed-on: https://code.wireshark.org/review/8000
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 11:45:13 +00:00
Alexis La Goutte bc457cb02c 802.11: don't return when Wrong Tag Length
Change-Id: I8de390e273e06620a8cdf62acae076ed6dd10a54
Reviewed-on: https://code.wireshark.org/review/7999
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 11:43:45 +00:00
AndersBroman 99e7395e9e Replace deprecated API tvb_length... with tvb_reported_length...
Change-Id: I44732d2743ba461d1791bb3795b0aef5a314bc1f
Reviewed-on: https://code.wireshark.org/review/8001
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-09 11:41:32 +00:00
Marian Ďurkovič 054a1aab50 TRILL: Fix incorrect header length
Change-Id: I508ee3d4143235157f223e5b9cd16d70cdf1fa72
Reviewed-on: https://code.wireshark.org/review/7997
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-09 08:19:06 +00:00
Michael Mann 66f7f6eec8 Improve ATH dissector.
Address comments made after initial dissector was submitted.

Change-Id: Ic42431d8af1d281dbe6f67a8f3f4d5e0aeea4156
Reviewed-on: https://code.wireshark.org/review/7995
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>
2015-04-09 05:58:09 +00:00
Julien STAUB 327ec9cb3b zigbee: correct zcl meas sensing
corrected the relative humidity measurement 0.00 to 100.00 values.
Previous version had bug for example 0.01% -> display 0.1%

Change-Id: I3955d36d1f2a1334ef7baab4fd854f13950d1951
Reviewed-on: https://code.wireshark.org/review/7983
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: Michael Mann <mmann78@netscape.net>
2015-04-09 02:24:20 +00:00
Martin Kaiser e243b00413 [IEEE 802.11] fix two potential endless loops
add_tagged_field() may return 0 if the tag length is not what is
expected for this particular tag

Bug: 11110

Change-Id: Ia2fd6635613fb6d8e1264147d2ddd44162484887
Reviewed-on: https://code.wireshark.org/review/7989
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-08 20:50:48 +00:00
Eugene Adell e1b566c748 ATH dissector
Change-Id: Idb51bb15e0e0764bd686cb4e822c313779245a4f
Reviewed-on: https://code.wireshark.org/review/7807
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-08 20:04:55 +00:00
Alexis La Goutte f3d2cb5881 802.11: Not showing all 11k subelement fields
Add support of Reported Frame Body (subelement of Beacon Report)

Bug:11101
Change-Id: I44f313ef081fcba7aaf6208baed81a46152fddb6
Reviewed-on: https://code.wireshark.org/review/7970
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08 08:25:46 +00:00
Alexis La Goutte c2f6dda291 WiFi P2P: Update to Peer-to-Peer (P2P) Technical Specification Version 1.5
Add new IE
19 Out-of-Band Group Owner Negotiation Channel
21 Service Hash
22 Session Information Data Info
23 Connection Capability Info
24 Advertisement_ID Info
25 Advertised Service Info
26 Session ID Info
27 Feature Capability
28 Persistent Group Info

Bug:11074
Change-Id: I627ca5906c1e3235aa7d4abb4ebfa757825b7fbf
Reviewed-on: https://code.wireshark.org/review/7914
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>
2015-04-08 08:23:24 +00:00
AndersBroman f6a183d034 Replace deprecated tvb_length with tvb_reported_length.
Change-Id: I45d2ae41da823c50ba383a8e2aaec570ee3ad842
Reviewed-on: https://code.wireshark.org/review/7979
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-08 08:18:50 +00:00
Michael Mann 1858b81e7b Remove RTAC Serial preference that doubled for Decode As.
Just use Decode As directly.

Change-Id: Iab03a6ff8a70c3c6b0406f426e622eb52bb34ba7
Reviewed-on: https://code.wireshark.org/review/7902
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-08 02:49:07 +00:00
Michael Mann 7ca04728c3 Remove MPLS preference that doubled for Decode As.
Just use Decode As directly.
Also replace "registered" dissectors which just the creation of a handle since the dissectors really don't need to be "found" outside of themselves.

Change-Id: I1e0c3ae784b71c0145b1f1730a97feae8e9f488f
Reviewed-on: https://code.wireshark.org/review/7899
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-08 02:48:54 +00:00
Michael Mann 3ab3158700 Add proper "Decode As" mechanism for FLIP payload instead of (many) preferences.
Other cleanup with FLIP dissector while in the neighborhood.

Change-Id: I0ecdea447979b0ba508a8bb84bd67e4eb4b32a70
Reviewed-on: https://code.wireshark.org/review/7896
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-08 02:48:35 +00:00
Pascal Quantin f467009815 ATM: add a cast to pacify the OSX 10.5 x86 buildbot
Change-Id: I2bff621b46b4811cf60ebaff8fca7429bed3a91e
Reviewed-on: https://code.wireshark.org/review/7973
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-07 15:32:59 +00:00
Bill Meier d3f2d8ce4f ieee80211.c: "IEEE 802.11 plus Network Monitor radio header" encap: Fix dissection
Specifically: Management/Control frames saved by Microsoft Netmon (3.4?)
with "IEEE 802.11 plus Network Monitor radio header"  encapsulation
may or may not be saved with an FCS.

See Bug 11105.

Fix: Use "check fcs" preference to specify whether Management & Control
frames have an fcs for this encapsulation.

Change-Id: Ibd0be7b4765c2df2b959cb2234aeed027266246b
Reviewed-on: https://code.wireshark.org/review/7939
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07 15:23:25 +00:00
Alexis La Goutte 9e724f7645 802.11: don't not showing all 11k subelement fields
Missing break for Measurement Report tag

Ping-Bug:11101
Change-Id: I570088f1eed756d541be74539774295eb67c2d47
Reviewed-on: https://code.wireshark.org/review/7969
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07 13:40:47 +00:00
Alexis La Goutte 862b16b3d3 SGSAP: fix indent (use 4 spaces)
Change-Id: I0c649d0a799817dea66ad297d47f9f22fdaa32c9
Reviewed-on: https://code.wireshark.org/review/7968
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-07 12:33:57 +00:00
AndersBroman f762de07d4 [SGSAP] Use the subtree for MCC MNC.
Change-Id: I9913fb0d92193723e8e83a58e0d76782b3d20204
Reviewed-on: https://code.wireshark.org/review/7967
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-07 12:13:40 +00:00
AndersBroman f8838c3dca [SGSAP] Add dissection of TMSI based NRI container and
Selected CS domain operator.

Change-Id: I7c9c089588848a44e1454803b767ac79c07d197f
Reviewed-on: https://code.wireshark.org/review/7964
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-07 11:21:59 +00:00
Sunil Mushran 8d59ead600 Add OCFS2 dissector.
Bug: 5553
Change-Id: If297036b6d7a7afe163d97b05bc4a319d6cf2e97
Reviewed-on: https://code.wireshark.org/review/7949
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-07 11:20:06 +00:00
Stig Bjørlykke a49e5523d0 DMP: Handle encoded 7bit string as binary.
This bug was introduced when rewriting tvb_get_string() to
handle encoding (and thus handling ASCII string different).

Change-Id: Ia37a9d075fb58c8d6c26af811e96f7ca1e82af3d
Reviewed-on: https://code.wireshark.org/review/7962
Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-04-07 06:58:52 +00:00
Michael Mann 0eb4dfe23c Add proper "Decode As" mechanism for AAL2 instead of preference.
Also create dissector table for AAL5 subdissectors.  This isn't identified as a "Decode As" need, but now the conversion should be easier if that becomes needed.

Change-Id: Ie70318991874de9ef8d95a2853dfceb3c0b94a00
Reviewed-on: https://code.wireshark.org/review/7894
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-07 01:27:17 +00:00
Julien STAUB 8fec18a0b6 zigbee: enhance zigbee illuminance cluster dissection
value displayed wasn't in lux

Change-Id: Id0c48c9a7968639e47d81e128c22c6cdcb3df929
Reviewed-on: https://code.wireshark.org/review/7945
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-06 19:41:04 +00:00
Robert P 686d3ef1a8 PKCS1: fix a typo for OID 1.3.132.0.35
Bug: 11106
Change-Id: Ied414b8e0bae8f34445f4d36bc6dfcc96b4a7456
Reviewed-on: https://code.wireshark.org/review/7941
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-06 16:52:08 +00:00
Martin Kaiser afe9b9bbaf fibre channel: remove some unnecessary if(tree) checks
Change-Id: Id55fcaa49d5ae46af2c26c7c641f6440335ca225
Reviewed-on: https://code.wireshark.org/review/7925
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-05 16:34:53 +00:00
Gerald Combs d4c8dca5d3 [Automatic update for 2015-04-05]
Update manuf, services enterprise-numbers, translations, and other items.

Change-Id: If98edeab7a413c33e54fbd579e975da26993a380
Reviewed-on: https://code.wireshark.org/review/7922
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-05 16:13:53 +00:00
Pascal Quantin 837948dc5c NAS EPS: remove proto_tree_add_text calls
Change-Id: Ib66a37c31df5da5c93dc7087528bb92d0ffec67e
Reviewed-on: https://code.wireshark.org/review/7920
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>
2015-04-05 15:58:44 +00:00
Alexis La Goutte 71eda00ad1 GSM: fix no previous prototype for 'de_sm_re_attempt_ind' [-Wmissing-prototypes]
Change-Id: Iaf4c01f659f9c0eed8615e77d0eab81724b44385
Reviewed-on: https://code.wireshark.org/review/7908
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-04 15:47:02 +00:00
Alexis La Goutte 38a5fceefc GSM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: If10a9902c231b87995562fd0c687a25dcab3e250
Reviewed-on: https://code.wireshark.org/review/7910
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-04 15:45:59 +00:00
Michael Mann 9d10be54c7 Some CANopen frame types can have zero size, so use tvb_reported_length instead of -1.
Bug: 11083
Change-Id: Ib17649fbbc4f79705e3ad18903b5c8847cb09054
Reviewed-on: https://code.wireshark.org/review/7881
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-04 13:01:27 +00:00
Michael Mann 37c41d7927 Add proper "Decode As" mechanism for I2C messages instead of preference.
Change-Id: Ifcf1193f97df6911ca9a0cf5613c9450b8fce1e4
Reviewed-on: https://code.wireshark.org/review/7897
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-04-04 09:07:51 +00:00
Michael Mann f031fafdcc Add proper "Decode As" mechanism for EtherNet/IP I/O instead of preference.
Change-Id: I9d7c0f296176679b61d7ee0c4358ce409dfc4f4f
Reviewed-on: https://code.wireshark.org/review/7895
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-04-04 02:21:01 +00:00
Pascal Quantin 8c31988c5f NAS EPS: upgrade dissector to v12.8.0
Change-Id: I8b7f7380c32c38fa5483a2966b56a6c2ee687c1c
Reviewed-on: https://code.wireshark.org/review/7892
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-03 16:16:15 +00:00
AndersBroman b9cf389e43 [S1AP] Display the decimal value for TAC.
Change-Id: I12127b5f7e53e2d47a42ad54d4e952f6a184d7b6
Reviewed-on: https://code.wireshark.org/review/7883
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-03 15:12:11 +00:00
Alexis La Goutte 1377dff2f6 802.11: don't not showing all 11k subelement fields
Add Request Channel Load and Noise Histogram

Bug:11101

Change-Id: I276eb4711169555a2df6a72c78d0ad743398b954
Reviewed-on: https://code.wireshark.org/review/7877
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-03 10:15:22 +00:00
Alexis La Goutte fdcc9e58de 802.11: don't not showing all 11k subelement fields
Add expert info when there is some undecoded Measure Request/Report type (and subtype)

Change-Id: Iece7487680d3211f28365d6596db31f408edb96b
Ping-Bug:11101
Reviewed-on: https://code.wireshark.org/review/7876
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-03 10:15:06 +00:00
Graham Bloice 23f0e16d05 Fix IMF Dissector
The IMF dissector doesn't properly handle the extra CRLF between
the headers and the body, leaving it as part of the last header,
and then fails to obtain the body contents due to incorrectly
specifying the length of the remaining data.

Change-Id: I8a1dfebd90e4cd5249f2244e9374a8e9ed3a25da
Reviewed-on: https://code.wireshark.org/review/7884
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-03 09:10:41 +00:00
Pascal Quantin a6459ca125 3GPP NAS: upgrade dissector to v12.9.0
Change-Id: I6bffe7b5b95d72031df5aecac66129d2ceff517e
Reviewed-on: https://code.wireshark.org/review/7889
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-03 05:23:32 +00:00
Pascal Quantin e4e59eb065 3GPP NAS: display Short Element Identifier as it was done prior to ge74cb41
Change-Id: Ie001b420eb1fd29c8f5c941e69f4e2929250d887
Reviewed-on: https://code.wireshark.org/review/7885
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-03 05:22:04 +00:00
Joerg Mayer 4e68f01c09 Fix:
packet-bitcoin.c:1735:6: error: 'hfi_msg_getheaders_version' undeclared (first use in this function)
     &hfi_msg_getheaders_version,

caused by previous commit. Weird that the compiler on my system didn't catch that.

Change-Id: I73cb06553bdf3a37f7c3d61d85f425d7c92d5b99
Reviewed-on: https://code.wireshark.org/review/7888
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-04-03 00:17:28 +00:00
Joerg Mayer f505d38d7b Fix:
git/epan/dissectors/packet-bitcoin.c:270:26: error: ‘hfi_msg_getheaders_version’ defined but not used [-Werror=unused-variable]

Change-Id: Ifcbc8be775e5f435497f5391755356caee48a7d9
Reviewed-on: https://code.wireshark.org/review/7887
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-04-02 23:52:04 +00:00
Alexis La Goutte c3bc15907d 802.11: EAPOL 4-way handshake information wrong
the EAPOL Key Exchange descriptions show key packets 2 and 4 as "Key (Message 4 of 4)"

Reason of issue : 
 In the IEEE 802.11 specification the value for the counter is defined as following:
Message #2 - counter = n
Message #4 - counter = n+1
So the only way to distinguish between message #2 and message #4 using the counter value would be for Wireshark to "look ahead" and compare the counter values (e.g., if counter1 < counter2, then message 2, else message 4).

Fix : 
However, there is a much easier way to distinguish between message #2 and message #4.  Instead of using the counter field, Wireshark could parse the "WPA Key Nonce" field (display filter = wlan_rsna_eapol.keydes.nonce).
According to the IEEE specification, sections 11.6.6.3 and 11.6.6.5 define the value for the WPA Key Nonce as following:
Message #2, Key Nonce = SNonce (Supplicant Nonce)
Message #4, Key Nonce = 0
So, the logic would be:
1. Use the Wireshark parser to determine the WPA Key Nonce value.  The Key nonce field is 32 octets.
2. If !(keynonce), then message #2
    Else message #4
(Only check the first 4 octets of nonce if equal to zero)


Issue reported by Murray Pickard
Reason of issue (and proposed fix) by Amato Carbonara

Bug: 10557
Change-Id: I66086ac27a4d7d3ac0356be295d23001e2af71c8
Reviewed-on: https://code.wireshark.org/review/7868
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-04-02 07:14:04 +00:00
Alexis La Goutte 6254896d62 AFP: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ib1c2bb355c7757b1aca4b59953ca6ab94aa30593
Reviewed-on: https://code.wireshark.org/review/7873
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>
2015-04-01 14:34:23 +00:00