osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

X11: General cleanup 

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>
This commit is contained in:
Michael Mann 2017-04-17 21:52:51 -04:00
parent d46adfe753
commit 0012214fac
3 changed files with 594 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

907
epan/dissectors/packet-x11.c
View File

File diff suppressed because it is too large Load Diff

4
epan/dissectors/x11-fields
View File

@ -66,7 +66,7 @@ backing-store UINT8 DEC VALS
bell-duration INT16 DEC
bell-percent INT8 DEC
bell-pitch INT16 DEC
bit-gravity UINT8 DEC VALS(gravity)
bit-gravity UINT8 DEC VALS(bit_gravity)
bit-plane UINT32 HEX
blue UINT16 DEC
blues UINT16 DEC
@ -535,7 +535,7 @@ warp-pointer-dst-window UINT32 HEX VALS(zero_is_none)
warp-pointer-src-window UINT32 HEX VALS(zero_is_none)
wid UINT32 HEX Window id
width UINT16 DEC
win-gravity UINT8 DEC VALS(gravity)
win-gravity UINT8 DEC VALS(win_gravity)
win-x INT16 DEC
win-y INT16 DEC
window UINT32 HEX

4
epan/dissectors/x11-register-info.h
View File

@ -63,7 +63,7 @@
{ &hf_x11_bell_duration, { "bell-duration", "x11.bell-duration", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_bell_percent, { "bell-percent", "x11.bell-percent", FT_INT8, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_bell_pitch, { "bell-pitch", "x11.bell-pitch", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_bit_gravity, { "bit-gravity", "x11.bit-gravity", FT_UINT8, BASE_DEC, VALS(gravity_vals), 0, NULL, HFILL }},
{ &hf_x11_bit_gravity, { "bit-gravity", "x11.bit-gravity", FT_UINT8, BASE_DEC, VALS(bit_gravity_vals), 0, NULL, HFILL }},
{ &hf_x11_bit_plane, { "bit-plane", "x11.bit-plane", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},
{ &hf_x11_blue, { "blue", "x11.blue", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_blues, { "blues", "x11.blues", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
@ -493,7 +493,7 @@
{ &hf_x11_warp_pointer_src_window, { "warp-pointer-src-window", "x11.warp-pointer-src-window", FT_UINT32, BASE_HEX, VALS(zero_is_none_vals), 0, NULL, HFILL }},
{ &hf_x11_wid, { "wid", "x11.wid", FT_UINT32, BASE_HEX, NULL, 0, "Window id", HFILL }},
{ &hf_x11_width, { "width", "x11.width", FT_UINT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_win_gravity, { "win-gravity", "x11.win-gravity", FT_UINT8, BASE_DEC, VALS(gravity_vals), 0, NULL, HFILL }},
{ &hf_x11_win_gravity, { "win-gravity", "x11.win-gravity", FT_UINT8, BASE_DEC, VALS(win_gravity_vals), 0, NULL, HFILL }},
{ &hf_x11_win_x, { "win-x", "x11.win-x", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_win_y, { "win-y", "x11.win-y", FT_INT16, BASE_DEC, NULL, 0, NULL, HFILL }},
{ &hf_x11_window, { "window", "x11.window", FT_UINT32, BASE_HEX, NULL, 0, NULL, HFILL }},