aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/x11-register-info.h
AgeCommit message (Collapse)AuthorFilesLines
2018-09-24Update the X11 dissector to use the latest mesa and xcbproto.Jeff Morriss1-12/+66
Change-Id: I6a72ec73c31c851723ba93e85cab3173d72c6a6b Reviewed-on: https://code.wireshark.org/review/29806 Petri-Dish: Jeff Morriss <jeff.morriss.ws@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Anders Broman <a.broman58@gmail.com>
2018-02-12dissectors: use SPDX identifiers.Dario Lombardo1-13/+1
Change-Id: I92c94448e6641716d03158a5f332c8b53709423a Reviewed-on: https://code.wireshark.org/review/25756 Petri-Dish: Dario Lombardo <lomato@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2017-04-18X11: Sort mesa_enum to allow for value_string_extMichael Mann1-256/+256
Adjust the dissector generator to put mesa_enum values in numerical order. Remove comments about where the specific values came from as sorting them means the comments aren't always going to be in the right place. Change-Id: I3c6b8252017c8a3ec379be49b3df069ec488cd1c Reviewed-on: https://code.wireshark.org/review/21198 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-18X11: General cleanupMichael Mann1-2/+2
1. Replace bitmask macros with proto_tree_add_bitmask + bitmask field handling 2. Replace REQUEST_LENGTH macro with actual function. Change-Id: Ibb3b2bc8c9d0556092af0e3dc384a4aad6c07ac2 Reviewed-on: https://code.wireshark.org/review/21185 Petri-Dish: Michael Mann <mmann78@netscape.net> 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>
2017-04-16X11: Resolve filter differences between a "list" and its "item".Michael Mann1-480/+480
The "list" is of type FT_NONE and the "item" is not. That can cause type conflicts. Change-Id: If62f7113bc120e392588724a0dd65b7ab32ccde7 Reviewed-on: https://code.wireshark.org/review/21146 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-16X11: Revert mesa_enum_ext back to mesa_enumMichael Mann1-256/+256
Values aren't numerically sorted in the XML, so they aren't put in the value_string in numerical order. That's a problem for value_string_ext. Change-Id: Ie40c5ab1083cc7be140d11dc131e3588759819b7 Reviewed-on: https://code.wireshark.org/review/21128 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-16X11: Ensure mesa_enum value_string has unique valuesMichael Mann1-256/+256
Also convert usage to a value_string_ext Change-Id: Ie515591355879f8eb65faf50e7c04b30cff13519 Reviewed-on: https://code.wireshark.org/review/21124 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2017-04-15x11: proto_tree_add_uint_format -> proto_tree_add_uint_format_valueMichael Mann1-8/+8
Change-Id: Ib8b80b2c4a79941cf56d8add783c88d1078f079a Reviewed-on: https://code.wireshark.org/review/21104 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2016-09-19Improve support for single-character fields and filter expressions.Guy Harris1-2/+2
Add an FT_CHAR type, which is like FT_UINT8 except that the value is displayed as a C-style character constant. Allow use of C-style character constants in filter expressions; they can be used in comparisons with all integral types, and in "contains" operators. Use that type for some fields that appear (based on the way they're displayed, or on the use of C-style character constants in their value_string tables) to be 1-byte characters rather than 8-bit numbers. Change-Id: I39a9f0dda0bd7f4fa02a9ca8373216206f4d7135 Reviewed-on: https://code.wireshark.org/review/17787 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2016-06-16Update the X11 dissector to use the latest mesa and xcbproto.Jeff Morriss1-1/+0
Change-Id: Ia1395cffaebbcf6585b9167861d8c3b4d86cf821 Reviewed-on: https://code.wireshark.org/review/15923 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-10-19x11: update X11 from last mesa and xcbAlexis La Goutte1-20/+402
Change-Id: Ic3567b4789385a29bb420fba5c56bd5fecbb6a22 Reviewed-on: https://code.wireshark.org/review/11114 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: Jeff Morriss <jeff.morriss.ws@gmail.com>
2015-05-01Fix some cases where we're shifting a signed 1 left.Guy Harris1-2068/+2068
Shift 1U instead, to make sure it's unsigned; the result of, for example, the result of shifting a signed value left is undefined if the value times 2^{shift count} doesn't fit in the *signed* type of the shifted value. That means, in particular, that the result of shifting 1 left by {number of bits in an int - 1} is undefined. (In *practice*, it'll probably be -2^32, with the bit you want set, but that's not guaranteed, and GCC 5.1 seems not to like it.) This fixes the generator for the X11 header files; we manually fix the header file in question, because life's too short to spend very much of it trying to debug Perl issues that cause a Can't use string ("1") as a HASH ref while "strict refs" in use at ../../tools/process-x11-xcb.pl line 675. at ../../tools/process-x11-xcb.pl line 1859 at ../../tools/process-x11-xcb.pl line 1859 failure. Change-Id: Ia903e9dacad49021bc0dfe129b9393ad426de9eb Reviewed-on: https://code.wireshark.org/review/8261 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-04Add resource-id parsing to the X11 errors that return itMichele Baldessari1-0/+1
- 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-10-02Extend X11 response parsingMichele Baldessari1-0/+32
Add support to parse screens, depths, visual-types and pixel-formats in the X11 connection initial response. v1->v2: - Do not show unused bytes when their length is 0 - Fix up tabs Change-Id: If62f0eab65a18e050fb3f830a6bd7574ab1f2de6 Reviewed-on: https://code.wireshark.org/review/4249 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-06-12X11: Update generated dissectorPeter Harris1-7/+0
Change-Id: Id3fbc64b4d797d50e935223c40c5c2321a1c8198 Signed-off-by: Peter Harris <pharris@opentext.com> Reviewed-on: https://code.wireshark.org/review/2148 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-1/+0
(Using sed :sed -i '/^\/\* \$Id\$ \*\//,+0 d') ( /* $Id */ ) Change-Id: I46e928d7f2a307c35876ed5d34cb6b7cccfcd6e9 Reviewed-on: https://code.wireshark.org/review/886 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2013-12-19Some patches from Peter Harris:Jeff Morriss1-1/+8
[PATCH 1/5] X11 dissector: Sort declarations This prevents pointless changes showing up in the diff when evaluating unrelated changes to the generator. See http://search.cpan.org/dist/perl-5.18.0/pod/perldelta.pod#Hash_randomization [PATCH 2/5] X11 dissector: Silence warnings on perl 5.18, prevent 5.20 Perl 5.18 retroactively marked "given/when" experimental, with a promise to remove or dramatically change it in 5.20. Since there is no perl 5.20 yet, there is no way to make this script compatible with it. [PATCH 3/5] X11 dissector: Support variable_param (at least for glCallLists) (This patch makes the change in r54232 unnecessary by using the previously- unused variable.) [PATCH 4/5] X11 dissector: Remove obsolete TODO item This item was done in r53531 PATCH 09/11 svn path=/trunk/; revision=54242
2013-11-24Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs.Jeff Morriss1-2/+2
Also, as per Peter Harris' request, update copyright date. svn path=/trunk/; revision=53545
2013-11-24Some patches from Peter Harris to make it possible to build the X11 dissectorJeff Morriss1-1470/+2017
again (and some various other improvements): Rebuild the dissector with the latest xcbproto and mesa. Subject: [PATCH 01/11] X11 dissector: Support CARD64 and INT64 types These types are used by the new Present extension. Subject: [PATCH 02/11] X11 dissector: Un-blacklist a few structures The xinput structs are used by the latest xcb/proto, and the xkb struct has been removed. Subject: [PATCH 03/11] X11 dissector: Add hack for xinput:ChangeProperty xinput:ChangeProperty should use switch/case, but only switch/bitcase is supported at the moment. Add (hopefully temporary) hack. Subject: [PATCH 04/11] X11 dissector: Use namespace for types In particular, the name of the xsync struct 'INT64' collides with a basic type of the same name. Subject: [PATCH 05/11] X11 dissector: Add support for "Generic" events All new extensions are using the new "Generic" events instead of traditional events, because there aren't enough traditional event numbers. Denoted by <event xge="true"> in xcb/proto. Subject: [PATCH 06/11] X11 dissector: Blacklist unused structures Subject: [PATCH 07/11] X11 dissector: Support multiple enumref in a bitcase XKB is weird. Subject: [PATCH 08/11] X11 dissector: Support sumof Subject: [PATCH 09/11] X11 dissector: Stop generating unused-but-set variables (This patch also reverts r53298/r53299.) svn path=/trunk/; revision=53531
2013-02-23Update x11-dissectors with last mesa trunk ( snb-magic-14719-g2fa9e4c ) and ↵Alexis La Goutte1-180/+227
xcbproto trunk ( 1.8-2-gc0d65da ) svn path=/trunk/; revision=47837
2012-03-13From Peter Harris:Jeff Morriss1-329/+401
An enum name collision was recently added to the upstream XCB/proto. Avoid the collision by putting enum names into their proper namespace. After applying that, regenerate the X11 dissector. svn path=/trunk/; revision=41514
2011-05-14Rebuild the X11 dissector with the latest versions of xcbproto and mesa.Jeff Morriss1-1/+19
svn path=/trunk/; revision=37145
2010-09-24(Refining the regexp...) Replace blurbs that match the name (case ↵Jeff Morriss1-1/+1
insensitive) with NULL. svn path=/trunk/; revision=34230
2010-06-03From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4820 :Jeff Morriss1-0/+1
Mesa moved its API description file again. Also, while I'm here, I noticed that they stopped using signed tags, so add --tags to "git describe" for a better description of the mesa version used to build the X11 dissector. svn path=/trunk/; revision=33067
2010-04-21From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4701 :Jeff Morriss1-0/+4
The ChangeProperty request always calls LISTofBYTE, which always tries to dissect at least one byte, even when the request is empty. This causes Wireshark to put a big, red, scary "Malformed Packet" entry in the dissection. Also, ChangeProperty only dissects (data_length) bytes. data_length is "number of units", and units may be 16 or 32-bit entities. In this case, the dissected data will be truncated. First reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481#c10 The attached patch fixes these two bugs. svn path=/trunk/; revision=32526
2010-04-20From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481 :Jeff Morriss1-3/+2818
The XKEYBOARD extension is a pain in the... so XCB had to grow new ways to describe the protocol. This patch adds support to the Wireshark dissector, so it can successfully process the XCB description of the XKEYBOARD extension. Without this patch, "make x11-dissector" chokes on the current xcbproto from git. Also update the script to deal with the new mesa directory structure. svn path=/trunk/; revision=32520
2009-10-03From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4067 :Jeff Morriss1-321/+541
This patch adds enum support to x11-process-xcb.pl svn path=/trunk/; revision=30257
2009-09-12Move all of the scripts in epan/dissectors/ to tools/ .Jeff Morriss1-2/+2
Add a target ("x11-dissector") to build the X11 dissector. Put the X11-related files (back) in the source distribution. svn path=/trunk/; revision=29871
2009-09-11From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2981 :Jeff Morriss1-0/+4118
This patch adds extension support to the X11 dissector. I've removed the perl script from the make file, since the new one depends on perl 5.10, xcbproto (at least git as of today), and mesa (at least the mesa/src/mesa/glapi directory). It seemed easier to just add the generated header files to svn directly. svn path=/trunk/; revision=29854