Commit Graph

56834 Commits

Author SHA1 Message Date
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
Pascal Quantin 53a5e4f6cb win32: fix detection of Windows 10 Technical Preview
The version number changed from 6.4 to 10.0

Change-Id: Ie749c97e8335f77d414d80edbd69373bd9a1cdad
Reviewed-on: https://code.wireshark.org/review/6820
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-28 09:19:48 +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
Gerald Combs 3aab6fc90e Qt: Update packet list freeze/thaw behavior.
Move the clear() calls in gee320ef a bit earlier in the code to
PacketList::freeze. No model means no packets.

Bug: 10896
Change-Id: Ie440e3da4c5fb601048f4e94c8712ecf2d864d4f
Reviewed-on: https://code.wireshark.org/review/6823
Reviewed-by: Sean Stalley <seanstalley@gmail.com>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-27 21:26:14 +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
Alexis La Goutte 7dfda8875a WIMAX: fix no previous prototype for ... [-Wmissing-prototypes]
Also comment the unused function wimax_decode_sub_dl_ul_map

Part 2...

Change-Id: I1836aa2851156e4f756c5697f86a142625d697c9
Reviewed-on: https://code.wireshark.org/review/6810
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 15:31:57 +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 32cbf791e6 Qt: Add checkable for Find Packet icon
Change-Id: Idd3c0b1893a9e0f8bc329e9157baaccd10de7378
Reviewed-on: https://code.wireshark.org/review/6814
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 12:47:35 +00:00
Alexis La Goutte b5a3907a71 Packet List (Qt): fix extra ‘;’ [-Wpedantic]
Change-Id: I3ac80a13da91452de4c857abfd6f2661b00e2f5d
Reviewed-on: https://code.wireshark.org/review/6815
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-27 12:47:05 +00:00
Alexis La Goutte 77227d40bf GTK: Fix multispace on main title bar
Change-Id: I275a586c16621fdfabede23f6a1d03c8d8556b3f
Reviewed-on: https://code.wireshark.org/review/6813
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 12:45:27 +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 ec7ff4e25d GTK: fix no previous prototype for ... [-Wmissing-prototypes]
Add by commit g43f09e67b (Remove unneeded includes from ui folder)

Change-Id: I66eb113430bde97e18bb3d2b00f6bac46a01797e
Reviewed-on: https://code.wireshark.org/review/6809
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 12:37:10 +00:00
Alexis La Goutte a9aba9408b GTK: fix no previous prototype for ... [-Wmissing-prototypes]
Add by commit g43f09e67b (Remove unneeded includes from ui folder)

Change-Id: I7c9d9e2bbd76d062f96422c74ee8eb8c6ecd328b
Reviewed-on: https://code.wireshark.org/review/6808
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-27 12:35:39 +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
Evan Huus ee320ef1bf qt: clear tree and bytes when no packet selected
Otherwise trying to interact with them will cause all sorts of funny crashes.

There's probably a better way to trigger these (having the widgets register for
a signal, and sending that signal, or something something something) but this
works and I don't feel like reading 20 pages of Qt documentation right this
instant.

Change-Id: Ic52806ae5ba8d7776f835695590559b8c705d083
Ping-Bug: 10896
Reviewed-on: https://code.wireshark.org/review/6803
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-27 03:38:13 +00:00
Gerald Combs a835c85e3d Pcapng: Don't fetch past the end of a GArray.
Due to an off-by-one error an invalid ISB interface ID could make us
fetch past the end of a GArray. Found using American Fuzzy Lop.

Bug: 10895
Change-Id: I7d4049ad7a386ae7e8013b8e741d54a31f353f1f
Reviewed-on: https://code.wireshark.org/review/6798
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-26 20:40:01 +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
Anders d5f0f2518a Add Cmakefiles missing from the distribution.
Change-Id: I77333bb1ca4b0fdfa2db095aab2e4e663c029dd3
Reviewed-on: https://code.wireshark.org/review/6797
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-26 15:53:30 +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
Guy Harris d015effb3c Update another comment to reflect reality.
Change-Id: I9747b746ed7c38ed3aa78f19ae20b61e142b94cc
Reviewed-on: https://code.wireshark.org/review/6785
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25 22:38:13 +00:00
Guy Harris fcac03d7e6 Update a comment to reflect reality.
Change-Id: I6376ce5eab43443314e73116161a24111f8c46d7
Reviewed-on: https://code.wireshark.org/review/6784
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25 22:34:38 +00:00
Guy Harris 88e22bdeb5 Remove some references to SVN.
Rename the --get-svn and --set-svn options to --get-vcs and --set-vcs;
continue to support --get-svn and --set-svn as aliases, for backwards
compatibility.  Change variable names as well.

Change-Id: If25d81dae747f9825f7e3e5e937749f078f63d27
Reviewed-on: https://code.wireshark.org/review/6783
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25 22:32:11 +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
Guy Harris c1078963b2 Replace "GIT" with "VCS" in make-version.pl and files it manipulates.
That makes it more VCS-neutral - apparently some people maintain private
versions under VCSes other than Git, and make-version.pl still handles
those VCSes.

Change-Id: Ie4914b16fea8ce800582729260c5e9b9cf1111f4
Reviewed-on: https://code.wireshark.org/review/6779
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25 21:51:13 +00:00
Guy Harris a3f3d0b7a0 Don't say "Git Rev" if the VCS being used isn't Git.
Change-Id: Ibd298b9665214e8af137a05ffb0c0aee67af91bf
Reviewed-on: https://code.wireshark.org/review/6777
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25 20:50:42 +00:00
Guy Harris bba51b649c Get rid of unused is_release preference.
Change-Id: I458f1d398b4eb566dd73e879ea3236a4de67da63
Reviewed-on: https://code.wireshark.org/review/6776
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25 20:15:34 +00:00
Guy Harris 2f713a6b07 Update some comments to reflect reality.
Change-Id: I230e3914bcd902dd481b59637f5ea21afc496978
Reviewed-on: https://code.wireshark.org/review/6775
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-25 20:02:53 +00:00
Hadriel Kaplan aec1bcf9a1 Lua can free tvbuffs too early
Lua-created tvbuffs should be kept around for the duration of pinfo's
lifetime, instead of only for the duration of frame dissection. So
instead of using the frame dissector's frame_end_routine, we'll register
a callback to wmem for pinfo pool's allocator.

Bug: 10888
Change-Id: I3e9db671c3f2a7cab9e258aca17f3be8acaf2417
Reviewed-on: https://code.wireshark.org/review/6768
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-01-25 19:11:01 +00:00
Gerald Combs 716f9a3197 [Automatic manuf, services and enterprise-numbers update for 2015-01-25]
Change-Id: Ic9c4903a49473c40f66dcf650f59d6a498bb9c05
Reviewed-on: https://code.wireshark.org/review/6772
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-25 16:06:21 +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
Dario Lombardo 52801889fc Added HCrt (Hotline Command-Response Transaction) Dissector.
Bug: 10853
Change-Id: Ieddb98b16e47906ba187cf03669b02a3ad397d60
Reviewed-on: https://code.wireshark.org/review/6533
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-25 15:59:03 +00:00
Evan Huus b2a5f15fbe RTPS: Memset entire buffer
Apparently some compilers do sufficient inlining optimization to notice that
there's at least one caller of rtps_util_add_typecode which passes an
indent_level of 0. Such compilers are *also* picky enough to complain about
memset being called with a length of 0, leading to a warning which we turn into
a compile error.

I thought about putting in an "if indent_level > 0" but I figure memsetting the
entire buffer (length >= 1) is simpler and more efficient in the common case.

Change-Id: Ica21ba988eb0c1251e7b4ef2e110336d5ee32837
Reviewed-on: https://code.wireshark.org/review/6766
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-01-24 19:31:20 +00:00
Gerald Combs cf142c6b67 Get Wireshark to compile with afl-gcc.
Fix errors found by American Fuzzy Lop's afl-gcc
(http://lcamtuf.coredump.cx/afl/):

peektagged.c:
error: 'fileVersion' may be used uninitialized in this function

packet-h223.c:
error: variable 'circuit_id' might be clobbered by 'longjmp' or 'vfork'

wslua_proto.c:
error: variable 'd' might be clobbered by 'longjmp' or 'vfork'

wslua_proto.c:
error: variable 'dt' might be clobbered by 'longjmp' or 'vfork'

Change-Id: Idd74a3ad7b236d3a8756c1e7e917b1c74143f381
Reviewed-on: https://code.wireshark.org/review/6767
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-24 19:14:38 +00:00