Commit Graph

22417 Commits

Author SHA1 Message Date
Michal Labedzki 1786cfee3f Bluetooth: Advertising Data: Fix Service Data entry
Service Data entry is defined as UUID (16, 32 or 128) and
rest of payload is specific service data.

Bug: 10859
Change-Id: Ibaee075a66a144dfc52ed70614677c73a88d6a2c
Reviewed-on: https://code.wireshark.org/review/6902
Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02 10:48:37 +00:00
Michal Labedzki 578c2beeb2 Bluetooth: btle_rf: Use proto_tree_add_bitmask
Change-Id: I79143cb788a13bd67ce2bd515b2b90d427dbcfcb
Reviewed-on: https://code.wireshark.org/review/6901
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02 10:48:22 +00:00
Michal Labedzki ef6f6f0eb1 Bluetooth: AVCTP: Improve IPID handling
If profile is invalid (IPID=1) then add expert info.

Change-Id: Id102e51eefe7e5e6314c3677468cb66573e5a893
Reviewed-on: https://code.wireshark.org/review/6900
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02 10:48:09 +00:00
Michal Labedzki c4f08ec0f9 Bluetooth: HCI Vendor: Fix for "Enable WBS" command
Codec value for mSBC is 0x02 (not 0x01), also "Codec" field
does not appear when Codec state in Disable.

Change-Id: I4f0b27d0dc8659fdc054eaf18b54a42aad60275b
Reviewed-on: https://code.wireshark.org/review/6899
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02 10:47:50 +00:00
Michal Labedzki 359ff3100b Bluetooth: HCI: Improve detecting of undecoded and unknown commands
Undecoded command - command does exist in specification,
                    but not fully implemented in Wireshark yet
Unknown command - command does not exist in specification or
                  it is quite new and opcode number is not added yet
Unexpected parameter - is now working correctly that means if
                       there is known command but too many parameters
                       so user should know about this issue

Change-Id: If3ee24f617f7e6683049558f7a6d68e346e7c92f
Reviewed-on: https://code.wireshark.org/review/6898
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-02-02 10:47:20 +00:00
Bill Meier 17b228bc52 dlm3: col_...() shouldn't be called under 'if (tree)'
Change-Id: I577dbfacf13854c74a430d7abec20faca3f0985b
Reviewed-on: https://code.wireshark.org/review/6891
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-01 17:57:14 +00:00
Bill Meier 50e841573d rip: Fix "Dissector Bug": register 5 missing hfi_... fields
[ Bug Introduced in gf8e24c9 ]

Change-Id: I99207334e33b30bf622bbed366c2222113108230
Reviewed-on: https://code.wireshark.org/review/6890
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-02-01 17:56:52 +00:00
Gerald Combs 351e7d58aa [Automatic manuf, services and enterprise-numbers update for 2015-02-01]
Change-Id: Iead3755cfba6c39c5da6398e356515337f2ecdd4
Reviewed-on: https://code.wireshark.org/review/6887
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-01 16:06:51 +00:00
Petr Gotthard a30022784a AMQP 0-9-1: Add missing methods connection.block and connection.unblock.
Change-Id: I11b32b876ec0f43b1faa2ab40ab66e7f18d981c2
Reviewed-on: https://code.wireshark.org/review/6857
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-02-01 07:25:13 +00:00
Bill Meier eda485ea53 Cleanup:
Including:
  tvb_length...() ==> tvb_reported_length...()
  Remove some dead initializers;
  Localize some variables;
  Whitespace.

Change-Id: Ide9490f248d558bb7e3af96a1fc17d8f911de4ef
Reviewed-on: https://code.wireshark.org/review/6862
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-30 19:04:32 +00:00
Bill Meier 7b929e2ff7 rtp: cleanup
- Remove dead initializers;
- Localize some vars;
- Whitespace

Change-Id: Ie98667de736f2928ce1a2e4986917e4b0457866f
Reviewed-on: https://code.wireshark.org/review/6861
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-30 19:04:09 +00:00
Bill Meier 1ec66f0a40 rtps: Cleanup
- Remove dead initializers;
- Localize some variables;
- Whitespace.

Change-Id: I876dfd88b2c3fe6a8056090f508c868f4a3cf653
Reviewed-on: https://code.wireshark.org/review/6860
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-30 19:03:48 +00:00
Evan Huus cc66f68c75 kafka: fill in some expert info
Change-Id: I94e655fc56fd1534d57f6917d9e5f4189e08838a
Reviewed-on: https://code.wireshark.org/review/6858
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>
2015-01-30 18:55:44 +00:00
Pascal Quantin 5e3936e9aa BSSGP: ensure that all Optional / Conditional Information Elements are treated as such
Bug: 10903
Change-Id: I8f6b970a6988fd4e700203304586c8e53dd5696b
Reviewed-on: https://code.wireshark.org/review/6845
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-30 11:24:56 +00:00
Pascal Quantin 14a869c705 GSM MAP: display TBCD digits, USSD string and Location Number digits in a subtree
Bug: 10900
Change-Id: I01277633a1314e68363ef433f3b99b4138657330
Reviewed-on: https://code.wireshark.org/review/6850
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-30 11:19:29 +00:00
Pascal Quantin a614212aa8 SDP: add ability to display port as a string
Bug: 10898
Change-Id: Ib1b5698c85cd568b8874b44690cafe391eea28f3
Reviewed-on: https://code.wireshark.org/review/6849
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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-30 07:49:28 +00:00
Alexis La Goutte 6824cee6c4 CAPWAP: Add support of Cisco Vendor Specific Element
Change-Id: I62886bda3220d9aa3a5b3aee8b40063a8bb7745d
Reviewed-on: https://code.wireshark.org/review/6843
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-01-30 03:09:11 +00:00
Dario Lombardo fd1bc6d8eb HCRT: udp port preference changed into range.
Change-Id: I6201bec1c3226181d2e5df8f3bf47471136b0ef5
Reviewed-on: https://code.wireshark.org/review/6839
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: 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-01-30 02:42:27 +00:00
Pascal Quantin 2edf8bbd33 SDP: check that media format starts with a digit before trying to identify media type
Bug: 10899
Change-Id: I92319a668ae795247d4021f32d629f5000ceb395
Reviewed-on: https://code.wireshark.org/review/6841
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-29 20:25:09 +00:00
Alexis La Goutte 0ba51cc0b2 IS-IS: Add subTLV Bandwidth Constraints (22) used by IS Reachability
Change-Id: I7e1d29270aede25268bb75a2b5fc9448dbc1cc9b
Reviewed-on: https://code.wireshark.org/review/6585
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-29 19:53:50 +00:00
Guy Harris 25f1df4459 "%l[doux]" doesn't mean "64-bit integer".
Use G_GINT64_MODIFIER as the format modifier to indicate that the value
being printed is 64-bit; there is no guarantee that long is 64-bit (it's
not 64-bit on ILP32 platforms such as 32-bit Windows and 32-bit UN*X, or
even on LLP64 platforms such as 64-bit Windows).

Change-Id: I0444f7f396969824f1040c06a67753718c32881b
Reviewed-on: https://code.wireshark.org/review/6838
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28 21:06:02 +00:00
Guy Harris 49a7e975f6 Try dissecting some stuff even if we don't have conversation information.
Fill in a local transaction information structure, so we can pass data
from the packet down.  Skip stuff that depends on conversation
information if we don't have any.

Change-Id: I5a8bd21bdf632ada9013e616c5fc4e8bd14c9698
Reviewed-on: https://code.wireshark.org/review/6837
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28 20:56:47 +00:00
Petr Gotthard 9e647a96b6 Extended AMQP 0-9 dissector to support AMQP 0-9-1 methods and datatypes. Backward compatibility to AMQP 0-9 is maintained.
Change-Id: Ie39cb40dca3d9f778ef2c04cbef24c968a91ec6c
Reviewed-on: https://code.wireshark.org/review/6791
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>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-28 20:01:17 +00:00
Pascal Quantin d7538cbe4b ANSI IS-637-A: prevent an out of bounds access
Bug: 10897
Change-Id: I8316ba40ec00b612e4edd490e3cd36e7277912a9
Reviewed-on: https://code.wireshark.org/review/6824
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-28 10:06:25 +00:00
Guy Harris 15c895dbc4 Make the USB header information an enumerated type.
It's not really a bitset, it's a choice of one of four types of USB
pseudo-header.  Make it an enum.

Change-Id: I4ea994e1606c23e0a0f08b1b61357eea40a2535e
Reviewed-on: https://code.wireshark.org/review/6830
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28 09:48:06 +00:00
Guy Harris 946856ada2 Move tests out of try_dissect_linux_usb_pseudo_header_ext().
Do the tests in its callers; rename it to just
dissect_linux_usb_pseudo_header_ext() and don't bother passing it the
header_info flag.

We can remove some of those tests as they're already done in the caller.

Change-Id: I7c3cfefba833a84c834462307088f5c31612128e
Reviewed-on: https://code.wireshark.org/review/6829
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28 09:17:36 +00:00
Guy Harris f090ebb887 Add documentation URLs for the Linux USB and USBPCAP pseudo-headers.
Change-Id: If5cecfeb66b3caca6478206f2fcb2f617ef02b46
Reviewed-on: https://code.wireshark.org/review/6828
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-28 05:25:24 +00:00
Dario Lombardo 99764223d2 Added json heuristic to Dropbox LAN sync Discovery Protocol.
Change-Id: I0d649ddc0f1539616eca0322ba54a7735338c738
Reviewed-on: https://code.wireshark.org/review/6817
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-01-27 20:32:21 +00:00
Bill Meier d3261b2dda Comment out various 'if(tree)'
col..._() and/or expert...() should not be called under 'if(tree)'

Change-Id: I57efe44794977d3f93e4764642b091044a125c0c
Reviewed-on: https://code.wireshark.org/review/6826
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-27 18:07:24 +00:00
Bill Meier 75858d787e rtps: Remove various 'if(tree)'
col_...() and expert_...() should not be called under 'if(tree)'

Change-Id: I2f1a8345ff18c0174bcd81b37179aa2d5ee74aca
Reviewed-on: https://code.wireshark.org/review/6825
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-27 18:06:52 +00:00
Alexis La Goutte 678cf27274 NETROM: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Ie534cbd4fb592d18f27039c654ba08e1beb7edff
Reviewed-on: https://code.wireshark.org/review/6819
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 15:35:42 +00:00
Alexis La Goutte 2e1030881e HCrt: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: I453c9b068a53292ab63cd3416569eea7d66361ba
Reviewed-on: https://code.wireshark.org/review/6818
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 15:33:23 +00:00
Hadriel Kaplan ceb8d954d2 Lua: Expose tcp_dissect_pdus() to Lua
Provide a way for Lua-based dissectors to invoke tcp_dissect_pdus()
to make TCP-based dissection easier.

Bug: 9851
Change-Id: I91630ebf1f1fc1964118b6750cc34238e18a8ad3
Reviewed-on: https://code.wireshark.org/review/6778
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-27 15:14:12 +00:00
Dario Lombardo 9bbc337306 Added HPFEEDS stats_tree.
Change-Id: I256fd5395b062fa954ebd60598721323ea1d7ff1
Bug: 10875
Reviewed-on: https://code.wireshark.org/review/6713
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: 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-01-27 13:19:20 +00:00
Alexis La Goutte c80aa10415 HCrt fix no previous prototype for 'proto_register_hcrt' [-Wmissing-prototypes]
Change-Id: Idca780885263c068ba31bbccb6009e75221b3adf
Reviewed-on: https://code.wireshark.org/review/6816
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 12:49:55 +00:00
Alexis La Goutte 5e309d6efe CAPWAP: fix double space on AC Software version
Change-Id: Ibe9715a1c2bf31e31ddda5ad2ad62fc0eda8164c
Reviewed-on: https://code.wireshark.org/review/6812
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 12:44:31 +00:00
Alexis La Goutte 11d25fae8f CATTP: fix no previous prototype for 'proto_register_cattp' [-Wmissing-prototypes]
Change-Id: Ifedb45d95d622c6df29f6917918015676f506831
Reviewed-on: https://code.wireshark.org/review/6807
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 12:32:34 +00:00
Roland Knall c0c2b45544 epl: Add Manufacturer subdissector
Allow manufacturer specific plugins, which will only
 be called for certain service IDs which are manufacturer
 specific as defined by the POWERLINK specification.

 As with e.g. udp.port, a plugin or subdissector may
 register with epl.asnd and a given service ID to implement
 a plugin for specific ASND Service IDs, which are part
 of the manufacturer specific object range (0xA0-0xFE).

 Also, all values for the ID fields have been changed to
 range_string

Change-Id: Ibfb9c035c16bce5322b13c42f30daf14e096712a
Reviewed-on: https://code.wireshark.org/review/6793
Reviewed-by: Roland Knall <rknall@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 07:56:43 +00:00
Joe Fowler 4fb2ec0053 SMC-R: fix incorrect dissection of non-SMCR packet. Failover
Validation bit definition is missing

dissect_smcr_tcp_heur() passes incorrect length to tvb_memeql(),
resulting in incorrectly identifying a packet as SMC-R.

Added Failover Validation bit.

Bug: 10887
Change-Id: I9f33389bd974b4c410a6b077d0d133221c77ee0d
Reviewed-on: https://code.wireshark.org/review/6765
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 05:45:26 +00:00
Bill Meier 5845f290ee rtp: Don't call col_...() under 'if (tree)'
Change-Id: I7d75e8d02aeaa67155ec52dd0167d1692286b951
Reviewed-on: https://code.wireshark.org/review/6800
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-26 20:09:54 +00:00
Bill Meier 717b5a2ecf rtmpt: Remove 'if (tree)'
Setting a var under 'if (tree)' and then using it later (not under 'if (tree)') to affect col_...()/expert_...() is not OK.

Change-Id: I144b5fa50b4550cd14c604970f5d84dbf13f3e90
Reviewed-on: https://code.wireshark.org/review/6799
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-26 20:09:24 +00:00
Pascal Quantin c9579d01c5 3GPP: upgrade 2G/3G NAS dissector to v12.8.0 and NAS EPS dissector to v12.7.0
Change-Id: I770506762074b50d40b4f4742d8316368f14b4de
Reviewed-on: https://code.wireshark.org/review/6794
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-01-26 16:23:19 +00:00
Evan Huus d50b27f4ce gsm-rlcmac: use wmem_new0 for a struct
Fixes "Conditional jump or move depends on uninitialised value" from Valgrind.

I couldn't really figure out how this code was supposed to function, it seems to
initialize one member of the union and then expect *all* the others to just
magically work (which they apparently do in most cases, oddly). The real bug
could be in csnStreamDissector or who knows, but this at least turns "garbage
data" into "zeros" which makes valgrind happy and turns a potential vuln into
at worst a bad decoding.

Bug: 10891
Change-Id: Ia29dd625b46b3b76ff521b4203148fe8b0c59ec3
Reviewed-on: https://code.wireshark.org/review/6769
Petri-Dish: Evan Huus <eapache@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-26 15:34:47 +00:00
Michael Mann abf5703ddb Register EtherNet/IP dissector for "external" use (like SSL)
Change-Id: Ic918c27f36569572523a17abb172b94cc32f2e3b
Reviewed-on: https://code.wireshark.org/review/6786
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-26 01:03:14 +00:00
Michael Mann d46568212d Roll functionality of h225-persistentdata module into packet-h225.c
Change-Id: I19b2a1b19e1e77a6456e2310daf64ddff572b0d2
Reviewed-on: https://code.wireshark.org/review/6788
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-01-26 01:02:33 +00:00
Michael Mann 155fc8f16a Move #defines of epan/greproto.h to packet-gre.h
Change-Id: I5de4c34e2acafbe47a8ca3f07040a774e72d0d3e
Reviewed-on: https://code.wireshark.org/review/6787
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-26 01:01:18 +00:00
Bill Meier be798e18f4 pana, gsm_abis_oml, rsl, netrom: Remove 'if (tree)'
Thou shalt call col_...() and/or a dissector under 'if(tree)'

Change-Id: Ibe62bc8229cb759d5f8b092aa7143d8e2f799037
Reviewed-on: https://code.wireshark.org/review/6781
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-25 22:04:42 +00:00
Bill Meier 065304cae1 applemidi: col_...() shouldn't be called under 'if(tree)'
Change-Id: I6ae8e122f1d1e7200255b51d2017b4375045c797
Reviewed-on: https://code.wireshark.org/review/6780
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-25 22:04:18 +00:00
Bill Meier 5003654fe0 Cleanup:
Including:
  Remove dead initializers;
  Remove boilerplate comments;
  Localize some variables;
  tvb_length...() ==> tvb_reported_length...();
  Use TRUE/FALSE when assigning a value to a gboolean;
  whitespace/indentaion.

Change-Id: I09e1f15611011bbe393d23e1cb54568ddd3cebc6
Reviewed-on: https://code.wireshark.org/review/6771
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-25 16:02:32 +00:00
Bill Meier b91df340e8 v52: Fix a minor bug introduced in gc71e88e; plus ...
Create/use extended value strings
tvb_length...() --> tvb_reported_length...()

Cleanup:
 Remove some dead initializers;
 Declare some vars as 'const' (initialized value is never changed);
 localize some vars;
 whitespace;

Change-Id: Iee21bb67fb42b1160b8ba2b7c2b89b410cc22225
Reviewed-on: https://code.wireshark.org/review/6770
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-25 16:02:00 +00:00