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

Add support for writing per packet comments when using pcapng. 

Not actually used with this commit, which just brings in the
infrastructure.


svn path=/trunk/; revision=46715
This commit is contained in:
Michael Tüxen 2012-12-23 09:25:42 +00:00
parent b70c24ca79
commit 644f8485da
4 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dumpcap.c
View File

@ -3979,6 +3979,7 @@ capture_loop_write_packet_cb(u_char *pcap_opts_p, const struct pcap_pkthdr *phdr
"ld->err" to the error. */
if (global_capture_opts.use_pcapng) {
successful = libpcap_write_enhanced_packet_block(global_ld.pdh,
NULL,
phdr->ts.tv_sec, phdr->ts.tv_usec,
phdr->caplen, phdr->len,
pcap_opts->interface_id,

31
pcapio.c
View File

@ -543,6 +543,7 @@ libpcap_write_interface_description_block(FILE *fp,
Returns TRUE on success, FALSE on failure. */
gboolean
libpcap_write_enhanced_packet_block(FILE *fp,
const char *comment,
guint32 sec, guint32 usec,
guint32 caplen, guint32 len,
guint32 interface_id,
@ -556,13 +557,24 @@ libpcap_write_enhanced_packet_block(FILE *fp,
struct option option;
guint32 block_total_length;
guint64 timestamp;
gboolean have_options = FALSE;
const guint32 padding = 0;
block_total_length = sizeof(struct epb) +
ADD_PADDING(caplen) +
sizeof(guint32);
if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
block_total_length += sizeof(struct option) +
(guint16)ADD_PADDING(strlen(comment));
have_options = TRUE;
}
if (flags != 0) {
block_total_length += 2 * sizeof(struct option) + sizeof(guint32);
have_options = TRUE;
block_total_length += sizeof(struct option) + sizeof(guint32);
}
/* If we have options add size of end-of-options */
if (have_options) {
block_total_length += sizeof(struct option);
}
timestamp = (guint64)sec * ts_mul + (guint64)usec;
epb.block_type = ENHANCED_PACKET_BLOCK_TYPE;
@ -577,6 +589,15 @@ libpcap_write_enhanced_packet_block(FILE *fp,
if (caplen % 4) {
WRITE_DATA(fp, &padding, 4 - caplen % 4, *bytes_written, err);
}
if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
option.type = OPT_COMMENT;
option.value_length = (guint16)strlen(comment);
WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
WRITE_DATA(fp, comment, strlen(comment), *bytes_written, err);
if (strlen(comment) % 4) {
WRITE_DATA(fp, &padding, 4 - strlen(comment) % 4 , *bytes_written, err);
}
}
if (flags != 0) {
option.type = EPB_FLAGS;
option.value_length = sizeof(guint32);
@ -585,7 +606,13 @@ libpcap_write_enhanced_packet_block(FILE *fp,
option.type = OPT_ENDOFOPT;
option.value_length = 0;
WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
}
}
if (have_options) {
option.type = OPT_ENDOFOPT;
option.value_length = 0;
WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
}
/* write the trailing Block Total Length */
WRITE_DATA(fp, &block_total_length, sizeof(guint32), *bytes_written, err);
return TRUE;
}

1
pcapio.h
View File

@ -88,6 +88,7 @@ libpcap_write_interface_statistics_block(FILE *fp,
extern gboolean
libpcap_write_enhanced_packet_block(FILE *fp,
const char *comment,
guint32 sec, guint32 usec,
guint32 caplen, guint32 len,
guint32 interface_id,

1
text2pcap.c
View File

@ -723,6 +723,7 @@ write_current_packet (void)
}
if (use_pcapng) {
success = libpcap_write_enhanced_packet_block(output_file,
NULL,
(guint32)ts_sec, ts_usec,
length, length,
0,