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

Support for hex dump mode in "Follow TCP Stream" window showing hex and 

ASCII data, from Jirka Novak.

svn path=/trunk/; revision=4564
This commit is contained in:
Guy Harris 2002-01-18 07:25:22 +00:00
parent 203d0680a1
commit b4867007ca
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AUTHORS
View File

@ -997,6 +997,8 @@ Jirka Novak <j.novak[AT]netsystem.cz> {
Support for adding filter expressions generated from column or
protocol tree field values to the current expression rather
than replacing the current expression
Support for hex dump mode in "Follow TCP Stream" window showing
hex and ASCII data
}
Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to

28
gtk/follow_dlg.c
View File

@ -1,6 +1,6 @@
/* follow_dlg.c
*
* $Id: follow_dlg.c,v 1.17 2002/01/11 07:40:31 guy Exp $
* $Id: follow_dlg.c,v 1.18 2002/01/18 07:25:22 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -53,6 +53,8 @@
# include "snprintf.h"
#endif
#include <ctype.h>
#include "color.h"
#include "color_utils.h"
#include "file.h"
@ -526,7 +528,7 @@ follow_read_stream(follow_info_t *follow_info,
sprintf(hexbuf, (is_server &&
follow_info->show_stream == BOTH_HOSTS) ?
" "
" %08X " :
" %08X " :
"%08X ", *global_pos);
cur = strlen(hexbuf);
for (i = 0; i < 16 && current_pos + i < nchars;
@ -542,6 +544,28 @@ follow_read_stream(follow_info_t *follow_info,
} else if (i != 15)
hexbuf[cur++] = ' ';
}
/* Fill it up if column isn't complete */
if (i < 16) {
int j;
for (j = i; j < 16; j++) {
if (j == 7)
hexbuf[cur++] = ' ';
hexbuf[cur++] = ' ';
hexbuf[cur++] = ' ';
hexbuf[cur++] = ' ';
}
} else
hexbuf[cur++] = ' ';
/* Now dump bytes as text */
for (i = 0; i < 16 && current_pos + i < nchars;
i++) {
hexbuf[cur++] = (isprint(buffer[current_pos + i]) ? buffer[current_pos + i] : '.' );
if (i == 7) {
hexbuf[cur++] = ' ';
}
}
current_pos += i;
(*global_pos) += i;
hexbuf[cur++] = '\n';