Commit Graph

55890 Commits

Author SHA1 Message Date
Michael Mann e172ebb3b4 Add proto_tree_add_bitmask_with_flags.
It's proto_tree_add_bitmask with the ability to control the data appended to header.

Change-Id: Icce97437ba7cfc9158ec204a837da8db8138424a
Reviewed-on: https://code.wireshark.org/review/5533
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:13:02 +00:00
Alexis La Goutte 75cdf9201e 802.11: fix indent (use 2 spaces) and modelines for 802.11 h file
Change-Id: If886809d9eeb900bb94c045413ff1295519b8311
Reviewed-on: https://code.wireshark.org/review/5641
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 01:00:50 +00:00
Alexis La Goutte f47bc26bc1 CAPWAP: Add some IEE802.11 Message Element Type (RFC5416)
* IEEE 802.11 Antenna (1025)
* IEEE 802.11 Direct Sequence Control (1028)
* IEEE 802.11 MAC Operation (1030)
* IEEE 802.11 MIC Countermeasures (1031)
* IEEE 802.11 Multi-Domain Capability (1032)
* IEEE 802.11 Station (1036)
* IEEE 802.11 Supported Rates (1040)
* IEEE 802.11 Tx Power (1041)
* IEEE 802.11 Tx Power Level (1042)
* IEEE 802.11 WTP Radio Configuration (1046)

Enhance 802.11 Rate Set (1034)

Change-Id: Ib37bc4081e75af051d80d023ddba689ecd9bf9ff
Reviewed-on: https://code.wireshark.org/review/5481
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 00:54:44 +00:00
Alexis La Goutte 58b7277cb4 802.11: Add ieee80211_supported_rates_vals_ext to be exported
It will be reused by CAPWAP dissector (* Rates Message Element)

Change-Id: I60ce12f382a35cdc2747baf23e2e3c30a305a8bd
Reviewed-on: https://code.wireshark.org/review/5640
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-08 00:48:53 +00:00
Guy Harris 212ba58fdc Add checks for non-null-terminated strings.
Change-Id: Iaad2d2f76e5d554800ba2c79d5c01f4b9da6fa0b
Reviewed-on: https://code.wireshark.org/review/5660
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-07 20:18:26 +00:00
Alexis La Goutte 5f79940d6c Endpoint: wrong filter when select a SCTP endpoint (INVALID == a.x.y.z ...)
Change-Id: I396e9af7971ee8be6fc9548162ff37fe704f0289
Reviewed-on: https://code.wireshark.org/review/5651
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:20:30 +00:00
Alexis La Goutte 42cdc2bc9b dcerpc: Missing break in switch (CID 280449 & 280450 & 284051)
Change-Id: I68fa9650c234c0f1fb8464b464a781b54f2c728c
Reviewed-on: https://code.wireshark.org/review/5657
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:15:11 +00:00
Alexis La Goutte 9d8cb74abf iec104: Missing break in switch (CID 280459)
Change-Id: I6abc157368a78e1abfde672728b88a36ba6e76cc
Reviewed-on: https://code.wireshark.org/review/5656
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:10:19 +00:00
Alexis La Goutte fd087fb644 AFS: Missing break in switch (CID 280434 & 280435)
Change-Id: Ia0a39f7e4670d74325ddc40b34cd56ca018c0bde
Reviewed-on: https://code.wireshark.org/review/5655
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 19:07:02 +00:00
Martin Kaiser a68a3daa01 make our counting a bit clearer
Change-Id: Ie64573f5a0b6e921a5011e487eea8e55f72b9a0b
Reviewed-on: https://code.wireshark.org/review/5653
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-07 18:53:41 +00:00
Martin Kaiser e456dec48b don't initialize variables if the first thing we do is assign a
different value to them

Change-Id: I719db9180b2ba5f21653086f2697ca9bac68d6b1
Reviewed-on: https://code.wireshark.org/review/5652
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-07 18:53:22 +00:00
Martin Kaiser ade2beffeb make sure that we don't read past the end of the compressed buffer
Bug: 10757
Change-Id: I30054c4a75ec86ea603cf78b702be5255c35f549
Reviewed-on: https://code.wireshark.org/review/5642
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-07 18:52:30 +00:00
Michael Mann 1bc8791fe6 Eliminate proto_tree_add_text from packet-telnet.c
Change-Id: I0e8610f381e650f2c5b3f78ea927b727ec9ac62a
Reviewed-on: https://code.wireshark.org/review/5637
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-07 16:17:15 +00:00
Gerald Combs afa5558479 [Automatic manuf, services and enterprise-numbers update for 2014-12-07]
Change-Id: Ice8195b09120fb21144e504289a64fd5af84775b
Reviewed-on: https://code.wireshark.org/review/5647
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-07 16:05:16 +00:00
Guy Harris de61f0684d The packet encapsulation is in pkt_encap, not rec_type.
rec_type is the type of record (which isn't necessarily a packet; future
work on libwiretap will let it return non-packet data); if it's a packet
(REC_TYPE_PACKET), then pkt_encap contains the "link-layer"
encapsulation for the packet (in quotes because it may contain metadata
not transmitted over the network).

Change-Id: I6f32b02f4466df6d7b07dbdc9d77e881830ac749
Reviewed-on: https://code.wireshark.org/review/5645
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-07 00:00:07 +00:00
Michael Mann 22da8a38ef Remove annex_a_used from packet_info structure.
Change-Id: I660caa8283aecff5060c6ed476f316bc5793373e
Reviewed-on: https://code.wireshark.org/review/5643
Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-12-06 21:42:43 +00:00
Guy Harris 6d4c0edc06 Don't go past the end of the "extra data".
The "extra data", according to the RF5 API manual I have, is "hardware
parameters", so change some names.

Report an error if the variable parts of the configuration event record
run past the record length.

Report an error if the hardware parameters are too short.

For the purportedly DS0 hardware parameters, don't assume they'll be
long enough for the mask; they might not be.

Change-Id: Ib63d042e4ede32216fb474c4ecdba84db1387abc
Reviewed-on: https://code.wireshark.org/review/5638
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-06 04:54:31 +00:00
Alexis La Goutte 8c190d6db2 RPKI-RTR: Missing break in switch (CID 1233099)
Change-Id: I01f01ce51fb1c9deb857ef01696b406b97dca3a9
Reviewed-on: https://code.wireshark.org/review/5616
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-06 02:08:33 +00:00
Alexis La Goutte 646d52ed21 PCEP: Missing break in switch (CID 1247685)
Change-Id: Id001a6c1e116fdabfd51c354832ca68f50e65e7d
Reviewed-on: https://code.wireshark.org/review/5618
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-06 01:22:35 +00:00
Alexis La Goutte a5fe0d401c BT obex: Missing break in switch (CID 1132031)
Change-Id: I6b8fc8db006bc3b8f8f4bac019cb7e240931d3b5
Reviewed-on: https://code.wireshark.org/review/5619
Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-06 01:20:48 +00:00
Guy Harris bb005704e2 Fix some copy-and-pasteos in error messages.
Change-Id: I1fe3434e69a08aae3d7413067275b3d7ee1552f5
Reviewed-on: https://code.wireshark.org/review/5634
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-05 23:47:43 +00:00
Guy Harris 45103068ff Get rid of a trailing blank.
Change-Id: I0cf6d04f5075ba1f064c40f4b39b32b6976b54c7
Reviewed-on: https://code.wireshark.org/review/5633
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-05 21:14:53 +00:00
Guy Harris b98c570969 Fix varargs handling in col_{add,append}_lstr().
We do multiple va_start() calls using the first string in the list of
strings; do *not* use the first-string argument to iterate over all the
argument strings, as that means that only the first va_start() call will
do the right thing, use a separate variable.

Bug: 10755
Change-Id: Ic4a6c24f911e335d147883a25d30289628836875
Reviewed-on: https://code.wireshark.org/review/5630
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-05 21:05:51 +00:00
Jeff Morriss 18fabb4733 Strengthen association matching when we haven't seen the INIT/INIT-ACK.
The fact that the vtag matches the initiate tag doesn't mean much if both are 0
(uninitialized).

Also leave in some (commented-out) debug to make debugging this stuff easier
in the future.

Change-Id: Id007de8bf9d2d4e0bb18309ed3e2572fedda45f1
Reviewed-on: https://code.wireshark.org/review/5571
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-05 14:14:55 +00:00
Stephen Fisher 086734456d Look for python3 in addition to python in configure script.
Change-Id: I77ff22aabdbbbf7376483b53d8795e7fbf0c0433
Reviewed-on: https://code.wireshark.org/review/5627
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-05 00:00:42 +00:00
Stephen Fisher d5a4cc34ec Make autogen.sh look for "python3" if "python" isn't found before
giving up.

Change-Id: Id109c78f90da71c54c7b4fd6df20cc153248f46f
Reviewed-on: https://code.wireshark.org/review/5623
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-04 23:54:47 +00:00
Martin Kaiser 3b7c165e20 use the same data types as in i2c_phdr
Change-Id: Ic0abcf8173a690a1dc0cd250f5e8770eb92a5aa9
Reviewed-on: https://code.wireshark.org/review/5626
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-04 22:06:21 +00:00
Martin Kaiser 5d95067bd5 simplify dissect_i2c()
Change-Id: I67dd6ae5dc48b297e5c04aba2fe53e3e159d2611
Reviewed-on: https://code.wireshark.org/review/5625
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-04 22:05:57 +00:00
Martin Kaiser 73f48a0916 dont't manually throw a ReportedBoundsError if the packet is empty
use tvb_captured_length() instead of tvb_length()

Change-Id: I7e7efd69515fc3e30c986ac5d9a56b4db1931c10
Reviewed-on: https://code.wireshark.org/review/5624
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-04 22:05:40 +00:00
Pascal Quantin 70ca52c023 3GPP: upgrade 2G/3G NAS dissector to v12.7.0 and NAS EPS dissector to v12.6.0
Change-Id: I1e5bc5d28cb956b333c302b1cb18335b59d096a8
Reviewed-on: https://code.wireshark.org/review/5621
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-04 15:26:18 +00:00
Jeff Morriss ab3c182f21 There's no need to talk about update-alternatives here.
Our "make install" process does nothing with 'alternatives'.  Our RPMs do use
alternatives but they do the necessary update-alternatives stuff already.

(If someone wants to set up Linux "make install"s to use alternatives it would
make sense to put these notes to the user back in.)

Change-Id: Ib7f4655a222ccaee83830a97b213656856cee73e
Reviewed-on: https://code.wireshark.org/review/5622
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-04 14:56:40 +00:00
Jeff Morriss b2fcbb2ba2 Add a MIME type for Tektronix rf5 files and register Wireshark for that type of
file.

The magic matching comes from wiretap/k12.c.

(Yes, I just made the application/x-tektronix-rf5 MIME type up.)

Change-Id: Iafd7300aa7f2664bb06e1330caede10785c21d68
Reviewed-on: https://code.wireshark.org/review/5607
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-04 14:04:58 +00:00
Steve Karg a919566091 BACnet: fix dissection of exception-schedule property.
The exception schedule special-event disection already used matched
open-close tags and only needed to check for an unmatched close tag
to exit when used with ReadPropertyMultiple service.

Bug: 10691
Change-Id: I54f2f6f3f470138a6a88f84c62fd15b07ea74c37
Reviewed-on: https://code.wireshark.org/review/5593
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>
2014-12-04 09:06:29 +00:00
Michele Baldessari f27c345700 Add resource-id parsing to the X11 errors that return it
- Rename BadColor to BadColormap as the former does not exist in the X11
  specs
- Parse the bad resource id field in case of the following errors:
  BadColormap, BadWindow, BadPixmap, BadCursor, BadFont, BadDrawable,
  BadGC and BadIDChoice

Change-Id: I5b23d32189e1a8bb291c656cf6383a85b3e89642
Reviewed-on: https://code.wireshark.org/review/5592
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-04 09:04:00 +00:00
Guy Harris b8a23643b3 Don't do the desktop integration stuff if we're not building Wireshark.
Wireshark is the desktop app; if we're not building it (i.e., we're only
building the command-line TShark), we don't need any desktop files.

Change-Id: Id8244b417fd53c9d55b4d77fe3ad748c98868ad7
Reviewed-on: https://code.wireshark.org/review/5615
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04 08:03:32 +00:00
Guy Harris c02417f851 Don't do all the fd.o desktop integration stuff on OS X.
It doesn't need it, so don't install those files, or uninstall them, or
suggest running various unnecessary commands after the installation
finishes.

Change-Id: Ieecab22884723670f47f2fc7cc1ac827f48c1967
Reviewed-on: https://code.wireshark.org/review/5614
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04 07:56:48 +00:00
Bill Meier 6e5d84f1e1 Rename some filter names to fix cases of duplicate filter names.
Note: Use of most of these filter names could have caused a Wireshark crash.

Change-Id: I393402a25dd26d174baff77f4706f6d5f43a94ae
Reviewed-on: https://code.wireshark.org/review/5610
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-04 03:44:45 +00:00
Bill Meier f8c0bff6b8 mac-lte: Rename expert filter name to fix conflict with same name in hf[]
Change-Id: I906a195b3c6a1e68f273decc9c443a233af4f9be
Reviewed-on: https://code.wireshark.org/review/5609
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-04 03:44:22 +00:00
Bill Meier d519617538 mausb: Rename expert filter names to fix dup filter names.
Change-Id: Id650c3aff6d073b05e844574ffbde8fec4368f49
Reviewed-on: https://code.wireshark.org/review/5608
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-04 03:43:32 +00:00
Guy Harris 245bdd13a6 Put a bunch of suggestions in post-install/post-uninstall hooks.
This covers a bunch of commands that might have to be run after "make
install".  ("might" - none are needed on OS X, for example, as it's a
different desktop and its dynamic loader doesn't have a cache that you
have to manually update whenever you install a new shared library.)

Change-Id: I21e1728bdde26a7ab1585fdfb54f63fdc1c25dd6
Reviewed-on: https://code.wireshark.org/review/5606
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04 02:38:50 +00:00
Jeff Morriss 1ffe32b165 Fix building of RPMs and get RPM builds working with a prefix other than /usr again.
(Change I567269d8e45e6543d9e39dbedc49830adf7edb9f made the desktop files
install outside of /usr/share/ .)

RPMs now build and work regardless of the prefix but the desktop integration stuff
only works if the prefix is /usr or (if you're lucky) /usr/local .

Change-Id: If20e0127a044eac1ba099f959a90d068c4bb2ae5
Reviewed-on: https://code.wireshark.org/review/5600
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-04 02:24:38 +00:00
Jeff Morriss 44e2716db3 Tell the loader where to find our libraries if we're being installed
someplace other than /usr .

Change-Id: I42cbe98bcfc0e8ba2aa08f651044db051d31205c
(cherry picked from commit 25d9695cb3536b672f4cd8bc280e2a3c816a0d8a)
Conflicts:
	packaging/rpm/SPECS/wireshark.spec.in
Reviewed-on: https://code.wireshark.org/review/5605
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-04 01:19:55 +00:00
Gerald Combs f0bd31171c CMake: Don't cache LUA_LIBRARIES.
Don't cache the LUA_LIBRARIES variable. This matches the behavior of the
other library modules and fixes a compilation problem on my machine
where /usr/local/lib/liblua.dylib wasn't showing up in the various
build.make and link.txt files.

Change-Id: Ib75ef303f2e67b266a246621718d0ea2ab885dca
Reviewed-on: https://code.wireshark.org/review/5603
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-04 00:16:41 +00:00
Jeff Morriss 0d20456a2a Make a note that cmake needs to install the freedesktop integration files too.
Change-Id: I5eeeb2fa32e8f90bc56f0515e0fc9f6c5f88eb79
Reviewed-on: https://code.wireshark.org/review/5602
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-03 23:38:35 +00:00
Jeff Morriss 7ef5abc818 Don't run gtk-update-icon-cache when uninstalling the Qt package. But do run
it when installing the gnome package.

Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87
Reviewed-on: https://code.wireshark.org/review/5598
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-12-03 22:06:24 +00:00
Pascal Quantin c86d1d2dd1 FC: fix dissection when packets are captured with Fibre Channel FC-2 encapsulation type
This is broken since ga9dd765

Bug: 10751
Change-Id: Id4f282d9e0104bfa2314e2348aedf31233a671bd
Reviewed-on: https://code.wireshark.org/review/5594
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>
2014-12-03 22:00:39 +00:00
Martin Kaiser 0a30f6878d start dissecting the stsz box
Change-Id: Ia8fce9307bae33c44d630af403980d162afd88c2
Reviewed-on: https://code.wireshark.org/review/5597
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-03 21:31:01 +00:00
Martin Kaiser 2f39f2e8aa BOX_TYPE_STZ2
Change-Id: I4eadf2b613b7803c81593e517408631f8375ab2c
Reviewed-on: https://code.wireshark.org/review/5596
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-03 21:30:36 +00:00
Martin Kaiser ee48194705 start dissecting the mvhd box
Change-Id: I66c1973daa89690f6aaa10891408e93e886875ea
Reviewed-on: https://code.wireshark.org/review/5595
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-12-03 21:30:18 +00:00
Guy Harris b088ca5efd Squelch some "can't happen in reality" warnings.
(I guess newer versions of GCC/Clang know that dissect_eh_frame() is
never called with a segment_size of 0, so the loop is traversed at least
once.  NOTE: if it ever *is* called with a segment_size of 0, then
that's a genuine bug and needs to be fixed.)

Also, segment_size is used; no need to mark it as unused.

Change-Id: I63b7a580a853b55f22494de73b4c4e6f9a387647
Reviewed-on: https://code.wireshark.org/review/5591
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-03 19:03:56 +00:00