Commit graph

20298 commits

Author SHA1 Message Date
Gerald Combs
e7a51d75ee [Automatic manuf, services and enterprise-numbers update for 2014-05-04]
Change-Id: Idd150c8d2a7f4e5368ca80c35ae920fb40944f1d
Reviewed-on: https://code.wireshark.org/review/1488
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-05-04 15:04:33 +00:00
David Ameiss
bdfe17f12e GUI modules for LBM aka 29West dissectors.
bug:9718
Change-Id: I05330d8a2475ad0d238723d444f3d98bdbd7be39
Reviewed-on: https://code.wireshark.org/review/1041
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-04 02:55:45 +00:00
Michael Mann
9606ec5954 Remove enabling HAVE_SNOW3G by default
Change-Id: Ie1af436b763ec762a41af0bdfc1f3ec6adea2bc1
Reviewed-on: https://code.wireshark.org/review/1486
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-04 01:13:07 +00:00
Martin Mathieson
1ddce8bb4c Have RRC tell MAC about RAPID ranges so it can show for RAPIDs seen
Change-Id: Ie9adbe3015c63e53997068053b6f8ec224a5bf82
Reviewed-on: https://code.wireshark.org/review/1474
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-03 21:39:20 +00:00
Martin Mathieson
32e3e410ae Update TODO comments
Change-Id: I4ea940be5b65c041bdd330bfc2bdbe9a00360d00
Reviewed-on: https://code.wireshark.org/review/1475
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-03 21:38:36 +00:00
Alexis La Goutte
a394d448f4 LLDP: Remove packet-lldp.h
Change-Id: If6d1fd1b7961f975447db43f616e016f70ca5cb8
Reviewed-on: https://code.wireshark.org/review/1473
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02 21:36:07 +00:00
Alexis La Goutte
59a4a856a3 ECP dissector Remove packet-lldp.h depends
* Fix indent (use tabs)
* Use VDP function for end VTPDU

Change-Id: I93216ac5b304dc3ba78cbe830e5d12589c138eb5
Reviewed-on: https://code.wireshark.org/review/1472
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02 21:35:20 +00:00
Alexis La Goutte
b7d6055f2e Move value string of LLDP OUI to epan/oui.h
Change-Id: I3d9ddbae60631c958880574e7e441a931db3492d
Reviewed-on: https://code.wireshark.org/review/1471
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-02 21:34:17 +00:00
Alexis La Goutte
fa84054dc7 Enhance display of SPDY packet (Remove some information from column)
Fix also tvb_length / tvb_length_remaining soft warning

Change-Id: I3fd8f3a842fa84273b84ae36317e2c3fbdca076d
Reviewed-on: https://code.wireshark.org/review/1461
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 14:43:40 +00:00
Alexis La Goutte
13e8983dbf Add modelines info
Change-Id: I35bed12af5e0a2da9daf2fb5b6dfdfe05377549e
Reviewed-on: https://code.wireshark.org/review/1470
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 14:41:37 +00:00
Alexis La Goutte
c27ad662f2 Add modelines info
Change-Id: I82f841e0ee9e00c69894d8c4c67f581278c87546
Reviewed-on: https://code.wireshark.org/review/1469
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 14:40:47 +00:00
Marcel Essig
34fa169719 Add a new Dissector for HiSLIP
Change-Id: I87aaf4c8093ee8013a661aa8af81dba63eaa7086
Signed-off-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-on: https://code.wireshark.org/review/1337
2014-05-02 13:39:42 +00:00
Alexis La Goutte
2b2d8a963b Fix Dereference of null pointer found by Clang analyzer
Also add modeline info and use _U_ only when it is needed (for pinfo)

Change-Id: I71349d6451e1d8304fad04781e5ee226a1a4c729
Reviewed-on: https://code.wireshark.org/review/1466
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-02 13:12:08 +00:00
Anish Bhatt
b5120cd965 Add support for Logical Link Down TLV.
TLV is 1 octet long, and only MSB holds info with 7 unused bits

Change-Id: Ic1f5ce1b774bb7439cd2a23bc9bfb44f7dc25888
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1450
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-05-02 05:48:06 +00:00
Pascal Quantin
4d55a12c0e MBIM: dissect MBIM_SET_STK_PAC and MBIM_STK_PAC_INFO messages
Change-Id: Ib58dece7ce7278e292d88f68368c238695c32394
Reviewed-on: https://code.wireshark.org/review/1463
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-01 19:04:24 +00:00
Michael Mann
6a80524341 Cleanup SPDY dissector.
Address Evan's missed comments from https://code.wireshark.org/review/767/

From Alexis La Goutte
Fix unused variable (pinfo) and fix crash (wrong variable in while)

Change-Id: I1b134585f4d522d3e808069f606beb4aae0488fa
Reviewed-on: https://code.wireshark.org/review/1164
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-05-01 14:15:40 +00:00
Alexis La Goutte
d3d4fb9c79 Add OSPF Authentication Trailer (RFC6506)
Change-Id: Ie5c536a6977e35acc12222af3c48d29740cd57f2
Closed-bug:9941
Reviewed-on: https://code.wireshark.org/review/1440
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-05-01 13:24:37 +00:00
Alexis La Goutte
583a47c06e Fix Dereference of null pointer found by Clang analyzer
packet-teamspeak2.c:456:21: warning: Access to field 'fragmented' results in a dereference of a null pointer (loaded from variable 'frag')

Change-Id: Ie253991f8d664c4594254bcd4569883614aafe2f
Reviewed-on: https://code.wireshark.org/review/1455
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-01 13:14:43 +00:00
Alexis La Goutte
601dc7313b Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I8ab25b1a3326ade46408ebd2e14cf841191c57d9
Reviewed-on: https://code.wireshark.org/review/1454
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-01 13:13:33 +00:00
Alexis La Goutte
39b533ed52 Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Id38f366c04edcf3326b323fc851a6644a942d79d
Reviewed-on: https://code.wireshark.org/review/1453
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-01 13:12:24 +00:00
Niels de Vos
2f960b7098 gluster: add support for GlusterD v3 procedures
The GlusterD Management protocol has been updated to version 3. All procedures are implemented with this change.

This change also takes care of converting values passed in a dictionary
to real and displayable GUIDs.

Change-Id: I93808eda393745aa9ab3b986a6b7997f6f80df50
Reported-by: Vikhyat Umrao <vumrao@redhat.com>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Reviewed-on: https://code.wireshark.org/review/1411
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-01 11:52:19 +00:00
Pascal Quantin
60c580dd13 AT: do not always prepend "/" to protocol name
Change-Id: Ice043e0355ea4d9112b377398079c94e66e35cc8
Reviewed-on: https://code.wireshark.org/review/1452
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-05-01 11:35:44 +00:00
Evan Huus
5dfd543aa3 Fix uninitialized struct in SMB2
Bug:10056
Change-Id: I6c7d3900208ee058ca9505e8d9f673ce4f4801cb
Reviewed-on: https://code.wireshark.org/review/1446
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-30 17:37:34 +00:00
Bill Meier
ca1f87e93c Add '#include "packet-ipsec.h'; Do some cleanup.
Cleanup:
- #include <stdio.h> & <ctype.h> only when needed;
- Add editor modelines;
- Convert tabs to spaces;
- Use a consistent indentation (2 spaces).

Change-Id: I5ef67b5c6aff99bf5dc1655b20760f862cd14d7f
Reviewed-on: https://code.wireshark.org/review/1445
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-04-30 17:36:28 +00:00
Pascal Quantin
45f381daa6 IPsec: fix compilation when building without libgcrypt
Change-Id: If525fb27ec607201efceb3ab9207305c3a4953dc
Reviewed-on: https://code.wireshark.org/review/1439
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-30 14:51:51 +00:00
Evan Huus
abe7f7da54 Cleanup libz streams in SPDY dissector
Fixes major memory leak.

Bug:10062
Change-Id: Ife70f12b8697a7873860c702ee0c740f98d98821
Reviewed-on: https://code.wireshark.org/review/1435
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-30 11:59:39 +00:00
Pascal Quantin
3116cf4add MBIM: use hash map instead of red/black tree for UUID extension table
Change-Id: Iaab9ff66e94bfe38fc875ad312b8e795b80814f4
Reviewed-on: https://code.wireshark.org/review/1438
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-30 10:15:12 +00:00
Alexis La Goutte
035f6f2fdc Try to make Mac OS X Buildbot Happy
packet-ipsec.c:1905: warning: implicit conversion shortens 64-bit value into a 32-bit value

Change-Id: Ic293e6b297f8f52aef7a102ab5ca0e0e98b9d7a7
Reviewed-on: https://code.wireshark.org/review/1436
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-30 08:54:46 +00:00
Martin Mathieson
266e0a9275 Add an API for programmatically adding ESP SAs (most likely from a private
dissector).

Also, speed up ESP decryption in several ways:
- store gcrypt_cipher_hd in the SA struct, rather than continually
open, setkey and close for each PDU
- don't convert the key string from ascii to hex each time - do it upon
during update callback and keep
- do the decryption in-place, avoiding the need to allocate, memcpy and
free a separate buffer for encrypted data
- when matching addresses, avoid doing a strlen until after we check
whether or not we're matching against "*"

Change-Id: Ibb66663ec21326351abc761be78a0d57f7797fa5
Reviewed-on: https://code.wireshark.org/review/1421
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-30 05:01:12 +00:00
Gerald Combs
133d4deb7e Fix cast for older versions of GLib.
The version of GLib on the 32-bit OS X builder defines

Unfortunately this results in a cast warning when u is a guint16. Newer
versions of GLib cast to gulong so do that.

Change-Id: I2d7e56ef9e5164789ee3a59115cb0f4a76155880
Reviewed-on: https://code.wireshark.org/review/1433
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-29 19:54:00 +00:00
Evan Huus
e185ad6ac9 Add casts to satisfy buildbot
I'm really not sure why it's complaining about a cast *up* from a guint16 to a
guint...

Change-Id: Ie24ae0ea2361b54ed255773a0fc86250a240b55a
Reviewed-on: https://code.wireshark.org/review/1431
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-29 15:32:30 +00:00
AndersBroman
371b17e857 Make id a guint to try to please OSX buildbot.
Change-Id: Ia97aa45ff0fc52fb21d2e864d1ca328646de547b
Reviewed-on: https://code.wireshark.org/review/1429
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-29 10:51:27 +00:00
Pascal Quantin
b2af5b066a Convert a few dissectors with simple request/response tracking from red/black tree to hash map
Update the readme file accordingly

Change-Id: I056d1ab1f77df641b83fa9b3618b6c25d66e1a83
Reviewed-on: https://code.wireshark.org/review/1420
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-29 10:23:32 +00:00
Anish Bhatt
8f2e234add Add support for Congestion Notification TLVs (802.1Qau)
I don't have sample captures for this, but the TLV layout is pretty simple and only contains two 1 octet bitmaps

Change-Id: Ibd7db7f40187904bbbf348c2cb89a5494cd46aab
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1427
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-29 06:01:00 +00:00
Mike Gerschefske
8d4db3e40b Updated items in dissect_ospf_v2_lsa to use filterable item fields
Change-Id: I226c6fd3d5aef9d3881416fba9c6259e6170357c
Reviewed-on: https://code.wireshark.org/review/1426
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-29 04:19:59 +00:00
Michael Mann
65700bd2e0 Make a dissector table out of IPv6 Next header.
This cleans up the implementation of the extension header, but also allows Decode As functionality for Next Header fields. This allows "old" SHIM6 IP protocol number (not IANA registered) to still be dissected.

bug:9995
Change-Id: I6f29a1f7db144478c5b6416d27da2c9c5a7a1de1
Reviewed-on: https://code.wireshark.org/review/1378
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-28 23:50:15 +00:00
Anish Bhatt
ec205458b1 Fix checkAPIs warnings in packet-lldp.c. repoted_length() used instead of captured_length() as is seems more logical
Change-Id: I02860d5c45e3fd794d9f99e2d382bc02ae886b36
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1422
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-28 22:23:01 +00:00
Anish Bhatt
eadaa0c50f This block of defines was always changed when I was retabbing my additions, this change fixes the tabs
Change-Id: I10e260a68cadf18d1aca10c7f037d45d311b6477
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1418
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-28 22:15:44 +00:00
Alexis La Goutte
e9d4f82ab7 HTTP2: with HTTP2 draft-1x, now upgrade use h2-XX or h2c-XX for upgrade HTTP1 Protocol (with XX number of draft)
Change-Id: I7b6394e1a84db34e34b4a05245414b81a62292af
Partial-Bug:10054
Reviewed-on: https://code.wireshark.org/review/1409
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-28 22:15:10 +00:00
Martin Mathieson
0708e0923e Update SR and DRX tracking when see UL CRC error'd frame, and add an
option to add generated items corresponding to the middle of
BSR ranges (suitable for plotting/stats).

Change-Id: I73b4e82ea5fb869d93d9666b9f8c9a10562db365
Reviewed-on: https://code.wireshark.org/review/1419
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-04-28 21:15:19 +00:00
Anish Bhatt
3765e99a07 With the use of tvb_reported_length_remaining(), there is no need to calculate consumedLen anymore
Change-Id: I8f4c32012061d3bff5e4efb80dfce8d82f7400df
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1417
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-28 20:49:21 +00:00
Alexis La Goutte
b512feda8a Fix Dereference of null pointer found by Clang analyzer
Change-Id: Icc25714cd923fcb514541f28ca19c7728dc1be55
Reviewed-on: https://code.wireshark.org/review/1412
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-28 18:48:27 +00:00
Alexis La Goutte
64650477a1 Make filterable OSPF Header...
* Remove if(tree)
* use proto_tree_add_item
* Enhance checksum display
...

Change-Id: I66062ecbe7f0c8170fbe9c4a2d7654d62a87c18b
Reviewed-on: https://code.wireshark.org/review/1414
Reviewed-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-28 18:48:09 +00:00
Philip Rosenberg-Watt
388859a2e3 DPoE OAM message decoding as per CableLabs spec.
Priority given to messages tested in DPoE 1.0 ATP.

Change-Id: I6ba3f1a8ca018f2231ad60f2f347ac57f1f93a00
Reviewed-on: https://code.wireshark.org/review/1076
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-28 17:35:56 +00:00
Philip Rosenberg-Watt
cd68b4744c Add dissector for LINKTYPE_EPON
See IEEE Standard 802.3-2012 Section 5, Clause 65 and CableLabs DPoE
Security and Certificate Specification 1.0, Section 6.

Currently dissects 1G mode. 10G mode will be added when hardware is
available.

Change-Id: I6232af9bf6807644ef66a120d97e5fa5927988fe
Reviewed-on: https://code.wireshark.org/review/1284
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-28 15:26:32 +00:00
Pascal Quantin
484b183e3f MBIM: make the backward compatibility function static
Change-Id: I51bbdf9c0dbb80a8350ec7762e588ca3182dce63
Reviewed-on: https://code.wireshark.org/review/1408
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-04-28 09:18:46 +00:00
Alexis La Goutte
a203bbbd5b Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I349a5aa7248979aa32eda9f853fd660dc01bdd08
Reviewed-on: https://code.wireshark.org/review/1407
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-28 08:34:12 +00:00
Anish Bhatt
581cdcee10 Add Support for IEEE DCBx (8021az)
Sample captures attached at https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=10055

Closed-bug:10055
Change-Id: Ib10e8d2a8aecdcf488eb174ed76a259433528f4a
Signed-off-by: Anish Bhatt <anish@chelsio.com>
Reviewed-on: https://code.wireshark.org/review/1403
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-28 08:32:12 +00:00
Lorand Jakab
7aebb0cec9 Fix issues reported by clang-analyzer
Change-Id: Iefb52c674be99af167eef7b2eba249607c1dfefd
Signed-off-by: Lorand Jakab <ljakab@ac.upc.edu>
Reviewed-on: https://code.wireshark.org/review/1406
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-28 06:25:59 +00:00
Mike Gerschefske
e240c4e9cd Updated ospf link state router messages to use proto_tree_add_item instead of proto_tree_add_text.
Change-Id: Icb04aaa68e7e8b79116a6ac48d1897eb387aab3e
Reviewed-on: https://code.wireshark.org/review/1404
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-28 06:22:50 +00:00