Commit Graph

24 Commits

Author SHA1 Message Date
Stephen Fisher 0df4eecd55 Add parenthesis around some generated code so it compiles. This new
code only shows up when the X11 dissector is updated from the latest
xcbproto & mesa, which I will commit real soon now (RSN).

Change-Id: Ic750df3b4406f107fd850ade891ee093054c8d6d
Reviewed-on: https://code.wireshark.org/review/5882
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 20:28:14 +00:00
Stephen Fisher 398c2cee9c Skip over the new 'switch' field in xproto/src/xinput.xml so we can
re-generate the x11 dissector again without the script breaking.

Change-Id: I6d24cf098f370f4c1ff191052e2ea67b7875b33a
Reviewed-on: https://code.wireshark.org/review/5878
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 17:05:35 +00:00
Stephen Fisher d3a4d926d0 Put a colon after the error message and before the field the error
is referring to for clarity.

Change-Id: I7930e851647c847335b91435c7b0871c6db2defe
Reviewed-on: https://code.wireshark.org/review/5847
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 04:17:19 +00:00
Stephen Fisher 23987b4ba5 Add a comment to each of these scripts to say that
epan/dissectors/README.X11 has instructions for running them.

Change-Id: Id3c1df1bf1f50b19372b9a0470822da9ca6504f7
Reviewed-on: https://code.wireshark.org/review/5846
Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19 03:51:12 +00:00
Peter Harris 331d87e303 X11: Support xcb's new <case>
Change-Id: I32c6ab15d6dc7a67cdb50c4187e2752730315588
Reviewed-on: https://code.wireshark.org/review/3751
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-08-22 00:04:52 +00:00
Peter Harris 515b78c292 X11: Support XCB's new <pad align='n' />
Change-Id: I0a45380ffcfb3be7e3190d0875626ed0fe046c4e
Signed-off-by: Peter Harris <pharris@opentext.com>
Reviewed-on: https://code.wireshark.org/review/2147
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-06-12 13:36:21 +00:00
Jeff Morriss 5a1aa01af2 Get rid of a few more Subversion remnants.
Change-Id: I35ff651017e355f92b4f9e6388e90d446f245d0a
Reviewed-on: https://code.wireshark.org/review/361
Reviewed-by: Evan Huus <eapache@gmail.com>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-25 18:05:08 +00:00
Jeff Morriss 82e2865739 Remove $Id$ and other Subversion leftovers from the tools.
There are a few things in here which could still use attention.

Don't regenerate anything now.

Change-Id: I283c224d3523212144707fca3d6265916cb11792
Reviewed-on: https://code.wireshark.org/review/205
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-14 01:35:57 +00:00
Jeff Morriss 6762f7e0c8 Some patches from Peter Harris:
[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-12-19 02:32:21 +00:00
Gerald Combs 5385c2d5f8 Instead of assigning a variable to itself, avoid unused warnings similar
to the Q_UNUSED macro.

svn path=/trunk/; revision=54232
2013-12-18 20:53:01 +00:00
Jeff Morriss a98072967e Fix checkAPIs: don't try to feed VALS() into FT_BOOLEANs.
Also, as per Peter Harris' request, update copyright date.

svn path=/trunk/; revision=53545
2013-11-24 14:27:52 +00:00
Jeff Morriss a434d9647e Some patches from Peter Harris to make it possible to build the X11 dissector
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-11-24 01:32:20 +00:00
Jeff Morriss 38eac2f54f Wrap GCC pragma in an #ifdef to make it compile when we're not using GCC.
Again, change manually applied to the .h file.

svn path=/trunk/; revision=53299
2013-11-13 14:00:45 +00:00
Jeff Morriss 8893d3d960 Use a gcc pragma to stop the (pages of) warnings coming out of
x11-extensions-implementation.h .

This change was manually applied to the .h file as I can't currently rebuild
the X11 dissector.

svn path=/trunk/; revision=53298
2013-11-13 03:20:37 +00:00
Michael Mann da96b71c95 Add filterable expert info to generated X11 dissector. I didn't regenerate the dissector files, but did manually update the source (tools/process-x11-xcb.pl) so any future regeneration won't lose the changes.
svn path=/trunk/; revision=51834
2013-09-08 13:54:07 +00:00
Jakub Zawadzki b18e880040 Update FSF address - part II.
svn path=/trunk/; revision=43538
2012-06-28 23:18:38 +00:00
Guy Harris f354e31304 A routine that processes a struct_XXX() won't necessarily use its
encoding argument; mark it as (potentially) unused.

svn path=/trunk/; revision=42609
2012-05-12 23:00:15 +00:00
Guy Harris 3896fea6c0 Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.

Updated tools/process-x11-xcb.pl to support different encoding values
for different fields.  Replaced the "little_endian" Boolean value with a
"byte_order" value containing the setting of the byte-order ENC_ bit. 
Regenerated X11 fields from current x.org git.

svn path=/trunk/; revision=42601
2012-05-12 20:07:08 +00:00
Jeff Morriss 9c3bbf44c1 From Peter Harris:
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
2012-03-13 00:07:34 +00:00
Jeff Morriss cca3ba3ce2 (Refining the regexp...) Replace blurbs that match the name (case insensitive) with NULL.
svn path=/trunk/; revision=34230
2010-09-24 02:51:40 +00:00
Jeff Morriss 584595fab3 From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4820 :
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-06-03 02:05:52 +00:00
Jeff Morriss ea25410415 From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4481 :
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
2010-04-20 00:18:51 +00:00
Jeff Morriss 37aa66532a From Peter Harris via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4067 :
This patch adds enum support to x11-process-xcb.pl

svn path=/trunk/; revision=30257
2009-10-03 01:56:10 +00:00
Jeff Morriss ee8f078374 Move all of the scripts in epan/dissectors/ to tools/ .
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-12 23:02:34 +00:00