osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Michael Mann 2013-09-08 13:54:07 +00:00
parent 306a110ed6
commit da96b71c95
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -202,6 +202,7 @@ static gint ett_x11_same_screen_focus = -1;
static gint ett_x11_event = -1;
static expert_field ei_x11_invalid_format = EI_INIT;
static expert_field ei_x11_request_length = EI_INIT;
/* desegmentation of X11 messages */
static gboolean x11_desegment = TRUE;
@ -5603,6 +5604,7 @@ void proto_register_x11(void)
static ei_register_info ei[] = {
{ &ei_x11_invalid_format, { "x11.invalid_format", PI_PROTOCOL, PI_WARN, "Invalid Format", EXPFILL }},
{ &ei_x11_request_length, { "x11.request-length.invalid", PI_PROTOCOL, PI_WARN, "Invalid Length", EXPFILL }},
};
module_t *x11_module;

2
epan/dissectors/x11-extension-implementation.h
View File

@ -3719,7 +3719,7 @@ static void dispatch_glx_render(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
*offsetp += 2;
if (len < 4) {
expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "Invalid Length");
expert_add_info(pinfo, ti, &ei_x11_request_length);
/* Eat the rest of the packet, mark it undecoded */
len = length;
op = -1;

2
tools/process-x11-xcb.pl
View File

@ -1439,7 +1439,7 @@ static void dispatch_glx_render(tvbuff_t *tvb, packet_info *pinfo, int *offsetp,
*offsetp += 2;
if (len < 4) {
expert_add_info_format(pinfo, ti, PI_MALFORMED, PI_ERROR, "Invalid Length");
expert_add_info(pinfo, ti, &ei_x11_request_length);
/* Eat the rest of the packet, mark it undecoded */
len = length;
op = -1;