#include <stdio.h>
#include <string.h>
+#include <glib.h>
+
#include <epan/epan.h>
#include <epan/epan_dissect.h>
#include <epan/tvbuff.h>
#include <epan/packet.h>
#include <epan/emem.h>
+#include <epan/expert.h>
#include "packet-range.h"
#include "print.h"
+#include "isprint.h"
#include "ps.h"
-#include "file_util.h"
+#include "version_info.h"
+#include <wsutil/file_util.h>
#include <epan/charsets.h>
#include <epan/dissectors/packet-data.h>
#include <epan/dissectors/packet-frame.h>
+#include <epan/filesystem.h>
#define PDML_VERSION "0"
#define PSML_VERSION "0"
GSList *src_list;
print_dissections_e print_dissections;
gboolean print_hex_for_data;
- char_enc encoding;
+ packet_char_enc encoding;
epan_dissect_t *edt;
} print_data;
struct _output_fields {
gboolean print_header;
gchar separator;
+ gchar occurrence;
+ gchar aggregator;
GPtrArray* fields;
GHashTable* field_indicies;
- const gchar** field_values;
+ emem_strbuf_t** field_values;
gchar quote;
};
+GHashTable *output_only_tables = NULL;
+
+static gboolean write_headers = FALSE;
+
static const gchar* get_field_hex_value(GSList* src_list, field_info *fi);
-static const gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt);
static void proto_tree_print_node(proto_node *node, gpointer data);
static void proto_tree_write_node_pdml(proto_node *node, gpointer data);
static const guint8 *get_field_data(GSList *src_list, field_info *fi);
static void write_pdml_field_hex_value(write_pdml_data *pdata, field_info *fi);
static gboolean print_hex_data_buffer(print_stream_t *stream, const guchar *cp,
- guint length, char_enc encoding);
+ guint length, packet_char_enc encoding);
static void ps_clean_string(unsigned char *out, const unsigned char *in,
int outbuf_size);
static void print_escaped_xml(FILE *fh, const char *unescaped_string);
/* Open the file or command for output */
if (to_file)
- fh = eth_fopen(dest, "w");
+ fh = ws_fopen(dest, "w");
else
fh = popen(dest, "w");
static
void proto_tree_print_node(proto_node *node, gpointer data)
{
- field_info *fi = PITEM_FINFO(node);
+ field_info *fi = PNODE_FINFO(node);
print_data *pdata = (print_data*) data;
const guint8 *pd;
gchar label_str[ITEM_LABEL_LENGTH];
gchar *label_ptr;
+ g_assert(fi && "dissection with an invisible proto tree?");
+
/* Don't print invisible entries. */
if (PROTO_ITEM_IS_HIDDEN(node))
return;
return;
}
+ /*
+ * If -O is specified, only display the protocols which are in the
+ * lookup table. Only check on the first level: once we start printing
+ * a tree, print the rest of the subtree. Otherwise we won't print
+ * subitems whose abbreviation doesn't match the protocol--for example
+ * text items (whose abbreviation is simply "text").
+ */
+ if (output_only_tables != NULL && pdata->level == 0
+ && g_hash_table_lookup(output_only_tables, fi->hfinfo->abbrev) == NULL) {
+ pdata->success = TRUE;
+ return;
+ }
+
if (PROTO_ITEM_IS_GENERATED(node)) {
g_free(label_ptr);
}
}
}
+#define PDML2HTML_XSL "pdml2html.xsl"
void
-write_pdml_preamble(FILE *fh)
+write_pdml_preamble(FILE *fh, const gchar* filename)
{
+ time_t t=time(NULL);
+ char *ts=asctime(localtime(&t));
+ ts[strlen(ts)-1]=0; /* overwrite \n */
+
fputs("<?xml version=\"1.0\"?>\n", fh);
+ fputs("<?xml-stylesheet type=\"text/xsl\" href=\"" PDML2HTML_XSL "\"?>\n", fh);
+ fprintf(fh, "<!-- You can find " PDML2HTML_XSL " in %s or at http://anonsvn.wireshark.org/trunk/wireshark/" PDML2HTML_XSL ". -->\n", get_datafile_dir());
fputs("<pdml version=\"" PDML_VERSION "\" ", fh);
- fprintf(fh, "creator=\"%s/%s\">\n", PACKAGE, VERSION);
+ fprintf(fh, "creator=\"%s/%s\" time=\"%s\" capture_file=\"%s\">\n", PACKAGE, VERSION, ts, filename ? filename : "");
}
void
static void
proto_tree_write_node_pdml(proto_node *node, gpointer data)
{
- field_info *fi = PITEM_FINFO(node);
+ field_info *fi = PNODE_FINFO(node);
write_pdml_data *pdata = (write_pdml_data*) data;
const gchar *label_ptr;
gchar label_str[ITEM_LABEL_LENGTH];
char *dfilter_string;
- int chop_len;
+ size_t chop_len;
int i;
+ gboolean wrap_in_fake_protocol;
+
+ g_assert(fi && "dissection with an invisible proto tree?");
/* Will wrap up top-level field items inside a fake protocol wrapper to
preserve the PDML schema */
- gboolean wrap_in_fake_protocol =
+ wrap_in_fake_protocol =
(((fi->hfinfo->type != FT_PROTOCOL) ||
(fi->hfinfo->id == proto_data)) &&
(pdata->level == 0));
/* Open fake protocol wrapper */
fputs("<proto name=\"fake-field-wrapper\">\n", pdata->fh);
- /* Indent to increased level before writint out field */
+ /* Indent to increased level before writing out field */
pdata->level++;
for (i = -1; i < pdata->level; i++) {
fputs(" ", pdata->fh);
print_escaped_xml(pdata->fh, label_ptr);
fprintf(pdata->fh, "\" size=\"%d", fi->length);
- fprintf(pdata->fh, "\" pos=\"%d", fi->start);
+ if (node->parent && node->parent->finfo && (fi->start < node->parent->finfo->start)) {
+ fprintf(pdata->fh, "\" pos=\"%d", node->parent->finfo->start + fi->start);
+ } else {
+ fprintf(pdata->fh, "\" pos=\"%d", fi->start);
+ }
fputs("\" value=\"", pdata->fh);
write_pdml_field_hex_value(pdata, fi);
/* Write out field with data */
fputs("<field name=\"data\" value=\"", pdata->fh);
write_pdml_field_hex_value(pdata, fi);
- fputs("\"/>\n", pdata->fh);
+ fputs("\">\n", pdata->fh);
}
/* Normal protocols and fields */
else {
- if (fi->hfinfo->type == FT_PROTOCOL) {
+ if (fi->hfinfo->type == FT_PROTOCOL && fi->hfinfo->id != proto_expert) {
fputs("<proto name=\"", pdata->fh);
}
else {
print_escaped_xml(pdata->fh, fi->hfinfo->abbrev);
#if 0
- /* PDML spec, see:
- * http://analyzer.polito.it/30alpha/docs/dissectors/PDMLSpec.htm
+ /* PDML spec, see:
+ * http://www.nbee.org/doku.php?id=netpdl:pdml_specification
*
* the show fields contains things in 'human readable' format
* showname: contains only the name of the field
* showdtl: contains additional details of the field data
* showmap: contains mappings of the field data (e.g. the hostname to an IP address)
*
- * XXX - the showname shouldn't contain the field data itself
- * (like it's contained in the fi->rep->representation).
- * Unfortunately, we don't have the field data representation for
+ * XXX - the showname shouldn't contain the field data itself
+ * (like it's contained in the fi->rep->representation).
+ * Unfortunately, we don't have the field data representation for
* all fields, so this isn't currently possible */
fputs("\" showname=\"", pdata->fh);
print_escaped_xml(pdata->fh, fi->hfinfo->name);
fprintf(pdata->fh, "\" hide=\"yes");
fprintf(pdata->fh, "\" size=\"%d", fi->length);
- fprintf(pdata->fh, "\" pos=\"%d", fi->start);
+ if (node->parent && node->parent->finfo && (fi->start < node->parent->finfo->start)) {
+ fprintf(pdata->fh, "\" pos=\"%d", node->parent->finfo->start + fi->start);
+ } else {
+ fprintf(pdata->fh, "\" pos=\"%d", fi->start);
+ }
/* fprintf(pdata->fh, "\" id=\"%d", fi->hfinfo->id);*/
/* show, value, and unmaskedvalue attributes */
fputs(" ", pdata->fh);
}
/* Close off current element */
- if (fi->hfinfo->id != proto_data) { /* Data protocol uses simple tags */
+ /* Data and expert "protocols" use simple tags */
+ if (fi->hfinfo->id != proto_data && fi->hfinfo->id != proto_expert) {
if (fi->hfinfo->type == FT_PROTOCOL) {
fputs("</proto>\n", pdata->fh);
}
else {
fputs("</field>\n", pdata->fh);
}
+ } else {
+ fputs("</field>\n", pdata->fh);
}
}
if (g_ptr_array_len(finfo_array) < 1) {
return;
}
- frame_finfo = finfo_array->pdata[0];
- g_ptr_array_free(finfo_array, FALSE);
+ frame_finfo = (field_info *)finfo_array->pdata[0];
+ g_ptr_array_free(finfo_array, TRUE);
/* frame.number --> geninfo.num */
finfo_array = proto_find_finfo(tree, hf_frame_number);
return;
}
num = fvalue_get_uinteger(&((field_info*)finfo_array->pdata[0])->value);
- g_ptr_array_free(finfo_array, FALSE);
+ g_ptr_array_free(finfo_array, TRUE);
- /* frame.pkt_len --> geninfo.len */
- finfo_array = proto_find_finfo(tree, hf_frame_packet_len);
+ /* frame.frame_len --> geninfo.len */
+ finfo_array = proto_find_finfo(tree, hf_frame_len);
if (g_ptr_array_len(finfo_array) < 1) {
return;
}
len = fvalue_get_uinteger(&((field_info*)finfo_array->pdata[0])->value);
- g_ptr_array_free(finfo_array, FALSE);
+ g_ptr_array_free(finfo_array, TRUE);
/* frame.cap_len --> geninfo.caplen */
finfo_array = proto_find_finfo(tree, hf_frame_capture_len);
return;
}
caplen = fvalue_get_uinteger(&((field_info*)finfo_array->pdata[0])->value);
- g_ptr_array_free(finfo_array, FALSE);
+ g_ptr_array_free(finfo_array, TRUE);
/* frame.time --> geninfo.timestamp */
finfo_array = proto_find_finfo(tree, hf_frame_arrival_time);
if (g_ptr_array_len(finfo_array) < 1) {
return;
}
- timestamp = fvalue_get(&((field_info*)finfo_array->pdata[0])->value);
- g_ptr_array_free(finfo_array, FALSE);
+ timestamp = (nstime_t *)fvalue_get(&((field_info*)finfo_array->pdata[0])->value);
+ g_ptr_array_free(finfo_array, TRUE);
/* Print geninfo start */
fprintf(fh,
/* Print geninfo.len */
fprintf(fh,
-" <field name=\"len\" pos=\"0\" show=\"%u\" showname=\"Packet Length\" value=\"%x\" size=\"%u\"/>\n",
+" <field name=\"len\" pos=\"0\" show=\"%u\" showname=\"Frame Length\" value=\"%x\" size=\"%u\"/>\n",
len, len, frame_finfo->length);
/* Print geninfo.caplen */
/* Print geninfo.timestamp */
fprintf(fh,
" <field name=\"timestamp\" pos=\"0\" show=\"%s\" showname=\"Captured Time\" value=\"%d.%09d\" size=\"%u\"/>\n",
- abs_time_to_str(timestamp), (int) timestamp->secs, timestamp->nsecs, frame_finfo->length);
+ abs_time_to_str(timestamp, ABSOLUTE_TIME_LOCAL, TRUE), (int) timestamp->secs, timestamp->nsecs, frame_finfo->length);
/* Print geninfo end */
fprintf(fh,
fputs("<?xml version=\"1.0\"?>\n", fh);
fputs("<psml version=\"" PSML_VERSION "\" ", fh);
fprintf(fh, "creator=\"%s/%s\">\n", PACKAGE, VERSION);
+ write_headers = TRUE;
}
void
gint i;
/* if this is the first packet, we have to create the PSML structure output */
- if(edt->pi.fd->num == 1) {
+ if(write_headers) {
fprintf(fh, "<structure>\n");
for(i=0; i < edt->pi.cinfo->num_cols; i++) {
}
fprintf(fh, "</structure>\n\n");
+
+ write_headers = FALSE;
}
fprintf(fh, "<packet>\n");
void
write_csv_preamble(FILE *fh _U_)
{
+ write_headers = TRUE;
+}
+static gchar *csv_massage_str(const gchar *source, const gchar *exceptions)
+{
+ gchar *csv_str;
+ gchar *tmp_str;
+
+ csv_str = g_strescape(source, exceptions);
+ tmp_str = csv_str;
+ while ( (tmp_str = strstr(tmp_str, "\\\"")) != NULL )
+ *tmp_str = '\"';
+ return csv_str;
}
-void
-proto_tree_write_csv(epan_dissect_t *edt, FILE *fh)
+static void csv_write_str(const char *str, char sep, FILE *fh)
{
- gint i;
+ gchar *csv_str;
- /* if this is the first packet, we have to write the CSV header */
- if(edt->pi.fd->num == 1) {
- for(i=0; i < edt->pi.cinfo->num_cols - 1; i++)
- fprintf(fh, "\"%s\",", edt->pi.cinfo->col_title[i]);
+ csv_str = csv_massage_str(str, NULL);
+ fprintf(fh, "\"%s\"%c", csv_str, sep);
+ g_free(csv_str);
+}
- fprintf(fh, "\"%s\"\n", edt->pi.cinfo->col_title[i]);
- }
+void
+proto_tree_write_csv(epan_dissect_t *edt, FILE *fh)
+{
+ gint i;
+ /* if this is the first packet, we have to write the CSV header */
+ if(write_headers) {
for(i=0; i < edt->pi.cinfo->num_cols - 1; i++)
- fprintf(fh, "\"%s\",", edt->pi.cinfo->col_data[i]);
+ csv_write_str(edt->pi.cinfo->col_title[i], ',', fh);
+ csv_write_str(edt->pi.cinfo->col_title[i], '\n', fh);
+ write_headers = FALSE;
+ }
- fprintf(fh, "\"%s\"\n", edt->pi.cinfo->col_data[i]);
+ for(i=0; i < edt->pi.cinfo->num_cols - 1; i++)
+ csv_write_str(edt->pi.cinfo->col_data[i], ',', fh);
+ csv_write_str(edt->pi.cinfo->col_data[i], '\n', fh);
}
void
}
+void
+write_carrays_preamble(FILE *fh _U_)
+{
+
+}
+
+void
+proto_tree_write_carrays(guint32 num, FILE *fh, epan_dissect_t *edt)
+{
+ guint32 i = 0, src_num = 0;
+ GSList *src_le;
+ data_source *src;
+ tvbuff_t *tvb;
+ const char *name;
+ const guchar *cp;
+ guint length;
+ char ascii[9];
+
+ for (src_le = edt->pi.data_src; src_le != NULL; src_le = src_le->next) {
+ memset(ascii, 0, sizeof(ascii));
+ src = (data_source *)src_le->data;
+ tvb = src->tvb;
+ length = tvb_length(tvb);
+ if (length == 0)
+ continue;
+
+ cp = tvb_get_ptr(tvb, 0, length);
+
+ name = get_data_source_name(src);
+ if (name)
+ fprintf(fh, "/* %s */\n", name);
+ if (src_num) {
+ fprintf(fh, "static const unsigned char pkt%u_%u[%u] = {\n",
+ num, src_num, length);
+ } else {
+ fprintf(fh, "static const unsigned char pkt%u[%u] = {\n",
+ num, length);
+ }
+ src_num++;
+
+ for (i = 0; i < length; i++) {
+ fprintf(fh, "0x%02x", *(cp + i));
+ ascii[i % 8] = isprint(*(cp + i)) ? *(cp + i) : '.';
+
+ if (i == (length - 1)) {
+ guint rem;
+ rem = length % 8;
+ if (rem) {
+ guint j;
+ for ( j = 0; j < 8 - rem; j++ )
+ fprintf(fh, " ");
+ }
+ fprintf(fh, " /* %s */\n};\n\n", ascii);
+ break;
+ }
+
+ if (!((i + 1) % 8)) {
+ fprintf(fh, ", /* %s */\n", ascii);
+ memset(ascii, 0, sizeof(ascii));
+ }
+ else {
+ fprintf(fh, ", ");
+ }
+ }
+ }
+}
+
+void
+write_carrays_finale(FILE *fh _U_)
+{
+
+}
+
/*
* Find the data source for a specified field, and return a pointer
* to the data in it. Returns NULL if the data is out of bounds.
gint length, tvbuff_length;
for (src_le = src_list; src_le != NULL; src_le = src_le->next) {
- src = src_le->data;
+ src = (data_source *)src_le->data;
src_tvb = src->tvb;
if (fi->ds_tvb == src_tvb) {
/*
print_escaped_xml(FILE *fh, const char *unescaped_string)
{
const char *p;
+ char temp_str[8];
for (p = unescaped_string; *p != '\0'; p++) {
switch (*p) {
fputs("'", fh);
break;
default:
- fputc(*p, fh);
+ if (g_ascii_isprint(*p))
+ fputc(*p, fh);
+ else {
+ g_snprintf(temp_str, sizeof(temp_str), "\\x%x", (guint8)*p);
+ fputs(temp_str, fh);
+ }
}
}
}
int i;
const guint8 *pd;
+ if (!fi->ds_tvb)
+ return;
+
if (fi->length > tvb_length_remaining(fi->ds_tvb, fi->start)) {
fprintf(pdata->fh, "field length invalid!");
return;
GSList *src_le;
data_source *src;
tvbuff_t *tvb;
- char *name;
+ const char *name;
char *line;
const guchar *cp;
guint length;
for (src_le = edt->pi.data_src; src_le != NULL;
src_le = src_le->next) {
- src = src_le->data;
+ src = (data_source *)src_le->data;
tvb = src->tvb;
if (multiple_sources) {
- name = src->name;
+ name = get_data_source_name(src);
print_line(stream, 0, "");
line = g_strdup_printf("%s:", name);
print_line(stream, 0, line);
static gboolean
print_hex_data_buffer(print_stream_t *stream, const guchar *cp,
- guint length, char_enc encoding)
+ guint length, packet_char_enc encoding)
{
register unsigned int ad, i, j, k, l;
guchar c;
* Start of a new line.
*/
j = 0;
- k = 0;
l = use_digits;
do {
l--;
line[j++] = binhex[c>>4];
line[j++] = binhex[c&0xf];
j++;
- if (encoding == CHAR_EBCDIC) {
+ if (encoding == PACKET_CHAR_ENC_CHAR_EBCDIC) {
c = EBCDIC_to_ASCII1(c);
}
line[k++] = c >= ' ' && c < 0x7f ? c : '.';
int rd, wr;
char c;
+ if (in == NULL) {
+ out[0] = '\0';
+ return;
+ }
+
for (rd = 0, wr = 0 ; wr < outbuf_size; rd++, wr++ ) {
c = in[rd];
switch (c) {
static gboolean
print_line_text(print_stream_t *self, int indent, const char *line)
{
- output_text *output = self->data;
+ output_text *output = (output_text *)self->data;
char space[MAX_INDENT+1];
int i;
int num_spaces;
static gboolean
new_page_text(print_stream_t *self)
{
- output_text *output = self->data;
+ output_text *output = (output_text *)self->data;
fputs("\f", output->fh);
return !ferror(output->fh);
static gboolean
destroy_text(print_stream_t *self)
{
- output_text *output = self->data;
+ output_text *output = (output_text *)self->data;
gboolean ret;
ret = close_print_dest(output->to_file, output->fh);
destroy_text
};
-print_stream_t *
-print_stream_text_new(int to_file, const char *dest)
+static print_stream_t *
+print_stream_text_alloc(int to_file, FILE *fh)
{
- FILE *fh;
print_stream_t *stream;
output_text *output;
- fh = open_print_dest(to_file, dest);
- if (fh == NULL)
- return NULL;
-
- output = g_malloc(sizeof *output);
+ output = (output_text *)g_malloc(sizeof *output);
output->to_file = to_file;
output->fh = fh;
- stream = g_malloc(sizeof (print_stream_t));
+ stream = (print_stream_t *)g_malloc(sizeof (print_stream_t));
stream->ops = &print_text_ops;
stream->data = output;
}
print_stream_t *
-print_stream_text_stdio_new(FILE *fh)
+print_stream_text_new(int to_file, const char *dest)
{
- print_stream_t *stream;
- output_text *output;
+ FILE *fh;
- output = g_malloc(sizeof *output);
- output->to_file = TRUE;
- output->fh = fh;
- stream = g_malloc(sizeof (print_stream_t));
- stream->ops = &print_text_ops;
- stream->data = output;
+ fh = open_print_dest(to_file, dest);
+ if (fh == NULL)
+ return NULL;
- return stream;
+ return print_stream_text_alloc(to_file, fh);
+}
+
+print_stream_t *
+print_stream_text_stdio_new(FILE *fh)
+{
+ return print_stream_text_alloc(TRUE, fh);
}
typedef struct {
static gboolean
print_preamble_ps(print_stream_t *self, gchar *filename)
{
- output_ps *output = self->data;
+ output_ps *output = (output_ps *)self->data;
unsigned char psbuffer[MAX_PS_LINE_LENGTH]; /* static sized buffer! */
print_ps_preamble(output->fh);
- fputs("%% Set the font to 10 point\n", output->fh);
- fputs("/Courier findfont 10 scalefont setfont\n", output->fh);
- fputs("\n", output->fh);
fputs("%% the page title\n", output->fh);
ps_clean_string(psbuffer, filename, MAX_PS_LINE_LENGTH);
- fprintf(output->fh, "/eth_pagetitle (%s - Wireshark) def\n", psbuffer);
+ fprintf(output->fh, "/ws_pagetitle (%s - Wireshark " VERSION "%s) def\n", psbuffer, wireshark_svnversion);
fputs("\n", output->fh);
return !ferror(output->fh);
}
static gboolean
print_line_ps(print_stream_t *self, int indent, const char *line)
{
- output_ps *output = self->data;
+ output_ps *output = (output_ps *)self->data;
unsigned char psbuffer[MAX_PS_LINE_LENGTH]; /* static sized buffer! */
ps_clean_string(psbuffer, line, MAX_PS_LINE_LENGTH);
static gboolean
print_bookmark_ps(print_stream_t *self, const gchar *name, const gchar *title)
{
- output_ps *output = self->data;
+ output_ps *output = (output_ps *)self->data;
unsigned char psbuffer[MAX_PS_LINE_LENGTH]; /* static sized buffer! */
/*
static gboolean
new_page_ps(print_stream_t *self)
{
- output_ps *output = self->data;
+ output_ps *output = (output_ps *)self->data;
fputs("formfeed\n", output->fh);
return !ferror(output->fh);
static gboolean
print_finale_ps(print_stream_t *self)
{
- output_ps *output = self->data;
+ output_ps *output = (output_ps *)self->data;
print_ps_finale(output->fh);
return !ferror(output->fh);
static gboolean
destroy_ps(print_stream_t *self)
{
- output_ps *output = self->data;
+ output_ps *output = (output_ps *)self->data;
gboolean ret;
ret = close_print_dest(output->to_file, output->fh);
destroy_ps
};
-print_stream_t *
-print_stream_ps_new(int to_file, const char *dest)
+static print_stream_t *
+print_stream_ps_alloc(int to_file, FILE *fh)
{
- FILE *fh;
print_stream_t *stream;
output_ps *output;
- fh = open_print_dest(to_file, dest);
- if (fh == NULL)
- return NULL;
-
- output = g_malloc(sizeof *output);
+ output = (output_ps *)g_malloc(sizeof *output);
output->to_file = to_file;
output->fh = fh;
- stream = g_malloc(sizeof (print_stream_t));
+ stream = (print_stream_t *)g_malloc(sizeof (print_stream_t));
stream->ops = &print_ps_ops;
stream->data = output;
}
print_stream_t *
-print_stream_ps_stdio_new(FILE *fh)
+print_stream_ps_new(int to_file, const char *dest)
{
- print_stream_t *stream;
- output_ps *output;
+ FILE *fh;
- output = g_malloc(sizeof *output);
- output->to_file = TRUE;
- output->fh = fh;
- stream = g_malloc(sizeof (print_stream_t));
- stream->ops = &print_ps_ops;
- stream->data = output;
+ fh = open_print_dest(to_file, dest);
+ if (fh == NULL)
+ return NULL;
- return stream;
+ return print_stream_ps_alloc(to_file, fh);
}
-output_fields_t* output_fields_new()
+print_stream_t *
+print_stream_ps_stdio_new(FILE *fh)
+{
+ return print_stream_ps_alloc(TRUE, fh);
+}
+
+output_fields_t* output_fields_new(void)
{
output_fields_t* fields = g_new(output_fields_t, 1);
fields->print_header = FALSE;
fields->separator = '\t';
+ fields->occurrence = 'a';
+ fields->aggregator = ',';
fields->fields = NULL; /*Do lazy initialisation */
fields->field_indicies = NULL;
fields->field_values = NULL;
- fields->quote='\0';
+ fields->quote='\0';
return fields;
}
if(NULL != fields->fields) {
gsize i;
for(i = 0; i < fields->fields->len; ++i) {
- gchar* field = g_ptr_array_index(fields->fields,i);
+ gchar* field = (gchar *)g_ptr_array_index(fields->fields,i);
g_free(field);
}
g_ptr_array_free(fields->fields, TRUE);
}
- g_free(fields);
+ g_free(fields);
}
void output_fields_add(output_fields_t* fields, const gchar* field)
return FALSE; /* Is this guarded against by option parsing? */
}
option_name = strtok(option,"=");
+ if (!option_name) {
+ return FALSE;
+ }
option_value = option + strlen(option_name) + 1;
if(0 == strcmp(option_name, "header")) {
switch(NULL == option_value ? '\0' : *option_value) {
info->separator = *option_value;
break;
}
- return TRUE;
+ return TRUE;
+ }
+
+ if(0 == strcmp(option_name, "occurrence")) {
+ switch(NULL == option_value ? '\0' : *option_value) {
+ case 'f':
+ case 'l':
+ case 'a':
+ info->occurrence = *option_value;
+ break;
+ default:
+ return FALSE;
+ }
+ return TRUE;
+ }
+
+ if(0 == strcmp(option_name,"aggregator")) {
+ switch(NULL == option_value ? '\0' : *option_value) {
+ case '\0':
+ return FALSE;
+ case '/':
+ switch(*++option_value) {
+ case 's':
+ info->aggregator = ' ';
+ break;
+ default:
+ info->aggregator = '\\';
+ }
+ break;
+ default:
+ info->aggregator = *option_value;
+ break;
+ }
+ return TRUE;
}
if(0 == strcmp(option_name, "quote")) {
info->quote='\0';
break;
}
- return TRUE;
+ return TRUE;
}
return FALSE;
void output_fields_list_options(FILE *fh)
{
fprintf(fh, "TShark: The available options for field output \"E\" are:\n");
- fputs("header=y|n Print field abbreviations as first line of output (def: N: no)\n", fh);
- fputs("separator=/t|/s|<character> Set the separator to use; \"/t\" = tab,\n \"/s\" = space (def: /t: tab)\n", fh);
- fputs("quote=d|s|n Print either d: double-quotes, s: single quotes or n: no quotes around field values (def: n: none)\n", fh);
+ fputs("header=y|n Print field abbreviations as first line of output (def: N: no)\n", fh);
+ fputs("separator=/t|/s|<character> Set the separator to use;\n \"/t\" = tab, \"/s\" = space (def: /t: tab)\n", fh);
+ fputs("occurrence=f|l|a Select the occurrence of a field to use;\n \"f\" = first, \"l\" = last, \"a\" = all (def: a: all)\n", fh);
+ fputs("aggregator=,|/s|<character> Set the aggregator to use;\n \",\" = comma, \"/s\" = space (def: ,: comma)\n", fh);
+ fputs("quote=d|s|n Print either d: double-quotes, s: single quotes or \n n: no quotes around field values (def: n: none)\n", fh);
}
}
for(i = 0; i < fields->fields->len; ++i) {
- const gchar* field = g_ptr_array_index(fields->fields,i);
+ const gchar* field = (const gchar *)g_ptr_array_index(fields->fields,i);
if(i != 0 ) {
fputc(fields->separator, fh);
}
fputs(field, fh);
- }
+ }
fputc('\n', fh);
}
-static void proto_tree_get_node_field_values(proto_node *node, gpointer data)
+static void proto_tree_get_node_field_values(proto_node *node, gpointer data)
{
write_field_data_t *call_data;
field_info *fi;
gpointer field_index;
- call_data = data;
- fi = PITEM_FINFO(node);
+ call_data = (write_field_data_t *)data;
+ fi = PNODE_FINFO(node);
+
+ g_assert(fi && "dissection with an invisible proto tree?");
field_index = g_hash_table_lookup(call_data->fields->field_indicies, fi->hfinfo->abbrev);
if(NULL != field_index) {
guint actual_index;
actual_index = GPOINTER_TO_UINT(field_index);
/* Unwrap change made to disambiguiate zero / null */
- call_data->fields->field_values[actual_index - 1] = value;
+ if ( call_data->fields->field_values[actual_index - 1] == NULL ) {
+ call_data->fields->field_values[actual_index - 1] = ep_strbuf_new(value);
+ } else if ( call_data->fields->occurrence == 'l' ) {
+ /* print only the value of the last occurrence of the field */
+ ep_strbuf_printf(call_data->fields->field_values[actual_index - 1],"%s",value);
+ } else if ( call_data->fields->occurrence == 'a' ) {
+ /* print the value of all accurrences of the field */
+ ep_strbuf_append_printf(call_data->fields->field_values[actual_index - 1],
+ "%c%s",call_data->fields->aggregator,value);
+ }
}
}
-
+
/* Recurse here. */
if (node->first_child != NULL) {
proto_tree_children_foreach(node, proto_tree_get_node_field_values,
i = 0;
while( i < fields->fields->len) {
- gchar* field = g_ptr_array_index(fields->fields, i);
- /* Store field indicies +1 so that zero is not a valid value,
+ gchar* field = (gchar *)g_ptr_array_index(fields->fields, i);
+ /* Store field indicies +1 so that zero is not a valid value,
* and can be distinguished from NULL as a pointer.
*/
++i;
- g_hash_table_insert(fields->field_indicies, field, GUINT_TO_POINTER(i));
+ g_hash_table_insert(fields->field_indicies, field, GUINT_TO_POINTER(i));
}
}
/* Buffer to store values for this packet */
- fields->field_values = ep_alloc_array0(const gchar*, fields->fields->len);
-
+ fields->field_values = ep_alloc_array0(emem_strbuf_t*, fields->fields->len);
+
proto_tree_children_foreach(edt->tree, proto_tree_get_node_field_values,
&data);
if(fields->quote != '\0') {
fputc(fields->quote, fh);
}
- fputs(fields->field_values[i], fh);
+ fputs(fields->field_values[i]->str, fh);
if(fields->quote != '\0') {
fputc(fields->quote, fh);
}
}
/* Returns an ep_alloced string or a static constant*/
-static const gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt)
+const gchar* get_node_field_value(field_info* fi, epan_dissect_t* edt)
{
if (fi->hfinfo->id == hf_text_only) {
/* Text label.
else {
/* Normal protocols and fields */
gchar *dfilter_string;
- gint chop_len;
+ size_t chop_len;
switch (fi->hfinfo->type)
{
{
const guint8 *pd;
+ if (!fi->ds_tvb)
+ return NULL;
+
if (fi->length > tvb_length_remaining(fi->ds_tvb, fi->start)) {
return "field length invalid!";
}
p = buffer;
/* Print a simple hex dump */
for (i = 0 ; i < fi->length; i++) {
- g_snprintf(p, len, "%02x", pd[i]);
+ g_snprintf(p, chars_per_byte+1, "%02x", pd[i]);
p += chars_per_byte;
- len -= chars_per_byte;
}
return buffer;
} else {
git.samba.org / obnox / wireshark / wip.git / blobdiff