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

Make the libwiretap Buffer routines usable from C++, and fix the C++ UI 

code to handle the API changes for the seek-read routines.

svn path=/trunk/; revision=49950
This commit is contained in:
Guy Harris 2013-06-16 01:40:04 +00:00
parent 8c9edf1280
commit ca0f8ee6da
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/qt/packet_list.cpp
View File

@ -570,7 +570,7 @@ QString &PacketList::getFilterFromRowAndColumn()
epan_dissect_init(&edt, have_custom_cols(&cap_file_->cinfo), FALSE);
col_custom_prime_edt(&edt, &cap_file_->cinfo);
epan_dissect_run(&edt, &cap_file_->phdr, cap_file_->pd, fdata, &cap_file_->cinfo);
epan_dissect_run(&edt, &cap_file_->phdr, buffer_start_ptr(&cap_file_->buf), fdata, &cap_file_->cinfo);
epan_dissect_fill_in_columns(&edt, TRUE, TRUE);
if ((cap_file_->cinfo.col_custom_occurrence[ctx_column_]) ||

9
ui/qt/packet_list_model.cpp
View File

@ -176,7 +176,7 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const
column_info *cinfo;
gboolean create_proto_tree;
struct wtap_pkthdr phdr; /* Packet header */
guint8 pd[WTAP_MAX_PACKET_SIZE]; /* Packet data */
Buffer buf; /* Packet data */
gboolean dissect_columns = TRUE; // XXX - Currently only a placeholder
if (dissect_columns && cap_file_)
@ -184,7 +184,8 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const
else
cinfo = NULL;
if (!cap_file_ || !cf_read_frame_r(cap_file_, fdata, &phdr, pd)) {
buffer_init(&buf, 1500);
if (!cap_file_ || !cf_read_frame_r(cap_file_, fdata, &phdr, &buf)) {
/*
* Error reading the frame.
*
@ -209,6 +210,7 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const
fdata->color_filter = NULL;
// record->colorized = TRUE;
}
buffer_free(&buf);
return QVariant(); /* error reading the frame */
}
@ -224,7 +226,7 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const
if (dissect_columns)
col_custom_prime_edt(&edt, cinfo);
epan_dissect_run(&edt, &phdr, pd, fdata, cinfo);
epan_dissect_run(&edt, &phdr, buffer_start_ptr(&buf), fdata, cinfo);
if (enable_color_)
fdata->color_filter = color_filters_colorize_packet(&edt);
@ -247,6 +249,7 @@ QVariant PacketListModel::data(const QModelIndex &index, int role) const
// record->colorized = TRUE;
epan_dissect_cleanup(&edt);
buffer_free(&buf);
return record->data(col_num, cinfo);
}

8
wiretap/buffer.h
View File

@ -27,6 +27,10 @@
#include <glib.h>
#include "ws_symbol_export.h"
#ifdef __cplusplus
extern "C" {
#endif /* __cplusplus */
#define SOME_FUNCTIONS_ARE_DEFINES
typedef struct Buffer {
@ -63,4 +67,8 @@ void buffer_remove_start(Buffer* buffer, gsize bytes);
void buffer_append_buffer(Buffer* buffer, Buffer* src_buffer);
#endif
#ifdef __cplusplus
}
#endif /* __cplusplus */
#endif