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

Finish the major part of merging duplicate code between follow TCP & SSL 

stream functions.


svn path=/trunk/; revision=22869
This commit is contained in:
Stephen Fisher 2007-09-13 22:11:50 +00:00
parent 168f8923e7
commit f673626e55
4 changed files with 161 additions and 250 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

136
gtk/follow_dlg.c
View File

@ -66,6 +66,7 @@
#include "print_mswin.h"
#include "font_utils.h"
#include "help_dlg.h"
#include <epan/charsets.h>
#include "follow_stream.h"
@ -328,15 +329,12 @@ follow_read_tcp_stream(follow_info_t *follow_info,
guint8 client_addr[MAX_IPADDR_LEN];
guint16 client_port = 0;
gboolean is_server;
guint32 current_pos, global_client_pos = 0, global_server_pos = 0;
guint32 global_client_pos = 0, global_server_pos = 0;
guint32 *global_pos;
gboolean skip;
gchar initbuf[256];
guint32 server_packet_count = 0;
guint32 client_packet_count = 0;
char buffer[FLT_BUF_SIZE+1]; /* +1 to fix ws bug 1043 */
size_t nchars;
static const gchar hexchars[16] = "0123456789abcdef";
frs_return_t frs_return;
iplen = (follow_info->is_ipv6) ? 16 : 4;
@ -389,124 +387,19 @@ follow_read_tcp_stream(follow_info_t *follow_info,
sc.dlen -= nchars;
if (!skip) {
switch (follow_info->show_type) {
case SHOW_EBCDIC:
/* If our native arch is ASCII, call: */
EBCDIC_to_ASCII(buffer, nchars);
if (!(*print_line) (buffer, nchars, is_server, arg))
goto print_error;
break;
case SHOW_ASCII:
/* If our native arch is EBCDIC, call:
* ASCII_TO_EBCDIC(buffer, nchars);
*/
if (!(*print_line) (buffer, nchars, is_server, arg))
goto print_error;
break;
case SHOW_RAW:
/* Don't translate, no matter what the native arch
* is.
*/
if (!(*print_line) (buffer, nchars, is_server, arg))
goto print_error;
break;
case SHOW_HEXDUMP:
current_pos = 0;
while (current_pos < nchars) {
gchar hexbuf[256];
int i;
gchar *cur = hexbuf, *ascii_start;
/* is_server indentation : put 78 spaces at the
* beginning of the string */
if (is_server && follow_info->show_stream == BOTH_HOSTS) {
memset(cur, ' ', 78);
cur += 78;
}
cur += g_snprintf(cur, 20, "%08X ", *global_pos);
/* 49 is space consumed by hex chars */
ascii_start = cur + 49;
for (i = 0; i < 16 && current_pos + i < nchars; i++) {
*cur++ =
hexchars[(buffer[current_pos + i] & 0xf0) >> 4];
*cur++ =
hexchars[buffer[current_pos + i] & 0x0f];
*cur++ = ' ';
if (i == 7)
*cur++ = ' ';
}
/* Fill it up if column isn't complete */
while (cur < ascii_start)
*cur++ = ' ';
/* Now dump bytes as text */
for (i = 0; i < 16 && current_pos + i < nchars; i++) {
*cur++ =
(isprint((guchar)buffer[current_pos + i]) ?
buffer[current_pos + i] : '.' );
if (i == 7) {
*cur++ = ' ';
}
}
current_pos += i;
(*global_pos) += i;
*cur++ = '\n';
*cur = 0;
if (!(*print_line) (hexbuf, strlen(hexbuf), is_server, arg))
goto print_error;
frs_return = follow_show(follow_info, print_line, buffer,
nchars, is_server, arg,
global_pos);
if(frs_return == FRS_PRINT_ERROR) {
fclose(data_out_file);
data_out_file = NULL;
return frs_return;
}
break;
case SHOW_CARRAY:
current_pos = 0;
g_snprintf(initbuf, sizeof(initbuf), "char peer%d_%d[] = {\n",
is_server ? 1 : 0,
is_server ? server_packet_count++ : client_packet_count++);
if (!(*print_line) (initbuf, strlen(initbuf), is_server, arg))
goto print_error;
while (current_pos < nchars) {
gchar hexbuf[256];
int i, cur;
cur = 0;
for (i = 0; i < 8 && current_pos + i < nchars; i++) {
/* Prepend entries with "0x" */
hexbuf[cur++] = '0';
hexbuf[cur++] = 'x';
hexbuf[cur++] =
hexchars[(buffer[current_pos + i] & 0xf0) >> 4];
hexbuf[cur++] =
hexchars[buffer[current_pos + i] & 0x0f];
/* Delimit array entries with a comma */
if (current_pos + i + 1 < nchars)
hexbuf[cur++] = ',';
hexbuf[cur++] = ' ';
}
/* Terminate the array if we are at the end */
if (current_pos + i == nchars) {
hexbuf[cur++] = '}';
hexbuf[cur++] = ';';
}
current_pos += i;
(*global_pos) += i;
hexbuf[cur++] = '\n';
hexbuf[cur] = 0;
if (!(*print_line) (hexbuf, strlen(hexbuf), is_server, arg))
goto print_error;
}
break;
}
}
}
}
if (ferror(data_out_file)) {
simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK,
"Error reading temporary file %s: %s", follow_info->data_out_filename,
@ -519,9 +412,4 @@ follow_read_tcp_stream(follow_info_t *follow_info,
fclose(data_out_file);
data_out_file = NULL;
return FRS_OK;
print_error:
fclose(data_out_file);
data_out_file = NULL;
return FRS_PRINT_ERROR;
}

136
gtk/follow_stream.c
View File

@ -49,6 +49,7 @@
#include <gtk/help_dlg.h>
#include <simple_dialog.h>
#include <wiretap/file_util.h>
#include <epan/charsets.h>
#include "main.h"
#include "print_mswin.h"
@ -819,7 +820,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
stream_mi = gtk_menu_item_new_with_label(server_to_client_string);
SIGNAL_CONNECT(stream_mi, "activate", follow_stream_om_client,
follow_info)
;
;
gtk_menu_append(GTK_MENU(stream_menu), stream_mi);
gtk_widget_show(stream_mi);
@ -833,7 +834,7 @@ follow_stream(gchar *title, follow_info_t *follow_info,
/* Set history to 0th item, i.e., the first item. */
gtk_option_menu_set_history(GTK_OPTION_MENU(stream_om), 0);
gtk_tooltips_set_tip (tooltips, stream_om,
"Select the stream direction to display", NULL);
"Select the stream direction to display", NULL);
gtk_box_pack_start(GTK_BOX(hbox), stream_om, FALSE, FALSE, 0);
/* ASCII radio button */
@ -978,3 +979,134 @@ follow_destroy_cb(GtkWidget *w, gpointer data _U_)
g_free(follow_info);
}
frs_return_t
follow_show(follow_info_t *follow_info,
gboolean (*print_line)(char *, size_t, gboolean, void *),
char *buffer, size_t nchars, gboolean is_server, void *arg,
guint32 *global_pos)
{
guint32 server_packet_count = 0;
guint32 client_packet_count = 0;
gchar initbuf[256];
guint32 current_pos;
static const gchar hexchars[16] = "0123456789abcdef";
switch (follow_info->show_type) {
case SHOW_EBCDIC:
/* If our native arch is ASCII, call: */
EBCDIC_to_ASCII(buffer, nchars);
if (!(*print_line) (buffer, nchars, is_server, arg))
return FRS_PRINT_ERROR;
break;
case SHOW_ASCII:
/* If our native arch is EBCDIC, call:
* ASCII_TO_EBCDIC(buffer, nchars);
*/
if (!(*print_line) (buffer, nchars, is_server, arg))
return FRS_PRINT_ERROR;
break;
case SHOW_RAW:
/* Don't translate, no matter what the native arch
* is.
*/
if (!(*print_line) (buffer, nchars, is_server, arg))
return FRS_PRINT_ERROR;
break;
case SHOW_HEXDUMP:
current_pos = 0;
while (current_pos < nchars) {
gchar hexbuf[256];
int i;
gchar *cur = hexbuf, *ascii_start;
/* is_server indentation : put 78 spaces at the
* beginning of the string */
if (is_server && follow_info->show_stream == BOTH_HOSTS) {
memset(cur, ' ', 78);
cur += 78;
}
cur += g_snprintf(cur, 20, "%08X ", *global_pos);
/* 49 is space consumed by hex chars */
ascii_start = cur + 49;
for (i = 0; i < 16 && current_pos + i < nchars; i++) {
*cur++ =
hexchars[(buffer[current_pos + i] & 0xf0) >> 4];
*cur++ =
hexchars[buffer[current_pos + i] & 0x0f];
*cur++ = ' ';
if (i == 7)
*cur++ = ' ';
}
/* Fill it up if column isn't complete */
while (cur < ascii_start)
*cur++ = ' ';
/* Now dump bytes as text */
for (i = 0; i < 16 && current_pos + i < nchars; i++) {
*cur++ =
(isprint((guchar)buffer[current_pos + i]) ?
buffer[current_pos + i] : '.' );
if (i == 7) {
*cur++ = ' ';
}
}
current_pos += i;
(*global_pos) += i;
*cur++ = '\n';
*cur = 0;
if (!(*print_line) (hexbuf, strlen(hexbuf), is_server, arg))
return FRS_PRINT_ERROR;
}
break;
case SHOW_CARRAY:
current_pos = 0;
g_snprintf(initbuf, sizeof(initbuf), "char peer%d_%d[] = {\n",
is_server ? 1 : 0,
is_server ? server_packet_count++ : client_packet_count++);
if (!(*print_line) (initbuf, strlen(initbuf), is_server, arg))
return FRS_PRINT_ERROR;
while (current_pos < nchars) {
gchar hexbuf[256];
int i, cur;
cur = 0;
for (i = 0; i < 8 && current_pos + i < nchars; i++) {
/* Prepend entries with "0x" */
hexbuf[cur++] = '0';
hexbuf[cur++] = 'x';
hexbuf[cur++] =
hexchars[(buffer[current_pos + i] & 0xf0) >> 4];
hexbuf[cur++] =
hexchars[buffer[current_pos + i] & 0x0f];
/* Delimit array entries with a comma */
if (current_pos + i + 1 < nchars)
hexbuf[cur++] = ',';
hexbuf[cur++] = ' ';
}
/* Terminate the array if we are at the end */
if (current_pos + i == nchars) {
hexbuf[cur++] = '}';
hexbuf[cur++] = ';';
}
current_pos += i;
(*global_pos) += i;
hexbuf[cur++] = '\n';
hexbuf[cur] = 0;
if (!(*print_line) (hexbuf, strlen(hexbuf), is_server, arg))
return FRS_PRINT_ERROR;
}
break;
}
return FRS_OK;
}

5
gtk/follow_stream.h
View File

@ -110,6 +110,11 @@ void follow_stream(gchar *title, follow_info_t *follow_info,
gchar *both_directions_string,
gchar *server_to_client_string,
gchar *client_to_server_string);
frs_return_t follow_show(follow_info_t *follow_info,
gboolean (*print_line)(char *, size_t, gboolean,
void *),
char *buffer, size_t nchars, gboolean is_server,
void *arg, guint32 *global_pos);
frs_return_t follow_read_tcp_stream(follow_info_t *follow_info, gboolean (*print_line)(char *, size_t, gboolean, void *), void *arg);
frs_return_t follow_read_ssl_stream(follow_info_t *follow_info, gboolean (*print_line)(char *, size_t, gboolean, void *), void *arg);

134
gtk/ssl-dlg.c
View File

@ -49,7 +49,6 @@
#include <epan/dissectors/packet-ipv6.h>
#include <epan/prefs.h>
#include <epan/addr_resolv.h>
#include <epan/charsets.h>
#include <util.h>
#include <gtk/gui_utils.h>
#include <epan/epan_dissect.h>
@ -290,14 +289,11 @@ follow_read_ssl_stream(follow_info_t *follow_info,
void *arg)
{
int iplen;
guint32 current_pos, global_client_pos = 0, global_server_pos = 0;
guint32 global_client_pos = 0, global_server_pos = 0;
guint32 *global_pos;
gboolean skip;
gchar initbuf[256];
guint32 server_packet_count = 0;
guint32 client_packet_count = 0;
static const gchar hexchars[16] = "0123456789abcdef";
GList* cur;
frs_return_t frs_return;
iplen = (follow_info->is_ipv6) ? 16 : 4;
@ -319,125 +315,15 @@ follow_read_ssl_stream(follow_info_t *follow_info,
if (!skip) {
size_t nchars = rec->data.data_len;
char* buffer = (char*) rec->data.data;
gchar *buffer = g_strndup(rec->data.data, nchars);
switch (follow_info->show_type) {
case SHOW_EBCDIC:
/* Not yet implemented in show SSL stream */
break;
case SHOW_ASCII:
/* If our native arch is EBCDIC, call:
* ASCII_TO_EBCDIC(buffer, nchars);
*/
if (!(*print_line) (buffer, nchars, rec->is_server, arg))
goto print_error;
break;
case SHOW_RAW:
/* Don't translate, no matter what the native arch
* is.
*/
if (!(*print_line) (buffer, nchars, rec->is_server, arg))
goto print_error;
break;
case SHOW_HEXDUMP:
current_pos = 0;
while (current_pos < nchars) {
gchar hexbuf[256];
int i;
gchar *cur = hexbuf, *ascii_start;
/* is_server indentation : put 78 spaces at the
* beginning of the string */
if (rec->is_server && follow_info->show_stream == BOTH_HOSTS) {
memset(cur, ' ', 78);
cur += 78;
}
cur += g_snprintf(cur, 20, "%08X ", *global_pos);
/* 49 is space consumed by hex chars */
ascii_start = cur + 49;
for (i = 0; i < 16 && current_pos + i < nchars; i++) {
*cur++ =
hexchars[(buffer[current_pos + i] & 0xf0) >> 4];
*cur++ =
hexchars[buffer[current_pos + i] & 0x0f];
*cur++ = ' ';
if (i == 7)
*cur++ = ' ';
}
/* Fill it up if column isn't complete */
while (cur < ascii_start)
*cur++ = ' ';
/* Now dump bytes as text */
for (i = 0; i < 16 && current_pos + i < nchars; i++) {
*cur++ =
(isprint((guchar)buffer[current_pos + i]) ?
buffer[current_pos + i] : '.' );
if (i == 7) {
*cur++ = ' ';
}
}
current_pos += i;
(*global_pos) += i;
*cur++ = '\n';
*cur = 0;
if (!(*print_line) (hexbuf, strlen(hexbuf), rec->is_server, arg))
goto print_error;
}
break;
case SHOW_CARRAY:
current_pos = 0;
g_snprintf(initbuf, sizeof(initbuf), "char peer%d_%d[] = {\n",
rec->is_server ? 1 : 0,
rec->is_server ? server_packet_count++ : client_packet_count++);
if (!(*print_line) (initbuf, strlen(initbuf), rec->is_server, arg))
goto print_error;
while (current_pos < nchars) {
gchar hexbuf[256];
int i, cur;
cur = 0;
for (i = 0; i < 8 && current_pos + i < nchars; i++) {
/* Prepend entries with "0x" */
hexbuf[cur++] = '0';
hexbuf[cur++] = 'x';
hexbuf[cur++] =
hexchars[(buffer[current_pos + i] & 0xf0) >> 4];
hexbuf[cur++] =
hexchars[buffer[current_pos + i] & 0x0f];
/* Delimit array entries with a comma */
if (current_pos + i + 1 < nchars)
hexbuf[cur++] = ',';
hexbuf[cur++] = ' ';
}
/* Terminate the array if we are at the end */
if (current_pos + i == nchars) {
hexbuf[cur++] = '}';
hexbuf[cur++] = ';';
}
current_pos += i;
(*global_pos) += i;
hexbuf[cur++] = '\n';
hexbuf[cur] = 0;
if (!(*print_line) (hexbuf, strlen(hexbuf), rec->is_server, arg))
goto print_error;
}
break;
}
}
frs_return = follow_show(follow_info, print_line, buffer, nchars,
rec->is_server, arg, global_pos);
g_free(buffer);
if(frs_return == FRS_PRINT_ERROR)
return frs_return;
}
}
return FRS_OK;
print_error:
return FRS_PRINT_ERROR;
}