guint16 type;
guint16 value_length;
};
-#define OPT_ENDOFOPT 0
-#define OPT_COMMENT 1 /* currently not used */
-#define SHB_HARDWARE 2 /* currently not used */
-#define SHB_OS 3 /* currently not used */
-#define SHB_USERAPPL 4
-#define IDB_NAME 2
-#define IDB_FILTER 11
-#define ISB_IFRECV 4
-#define ISB_IFDROP 5
-#define ISB_FILTERACCEPT 6
-
+#define OPT_ENDOFOPT 0
+#define OPT_COMMENT 1
+#define SHB_HARDWARE 2 /* currently not used */
+#define SHB_OS 3
+#define SHB_USERAPPL 4
+#define IDB_NAME 2
+#define IDB_DESCRIPTION 3
+#define IDB_IF_SPEED 8
+#define IDB_TSRESOL 9
+#define IDB_FILTER 11
+#define IDB_OS 12
+#define ISB_STARTTIME 2
+#define ISB_ENDTIME 3
+#define ISB_IFRECV 4
+#define ISB_IFDROP 5
+#define ISB_FILTERACCEPT 6
+#define ISB_OSDROP 7
+#define ISB_USRDELIV 8
#define ADD_PADDING(x) ((((x) + 3) >> 2) << 2)
#define WRITE_DATA(file_pointer, data_pointer, data_length, written_length, error_pointer) \
gboolean
libpcap_write_session_header_block(FILE *fp,
+ const char *comment,
+ const char *hw,
+ const char *os,
const char *appname,
+ guint64 section_length,
long *bytes_written,
int *err)
{
struct option option;
guint32 block_total_length;
const guint32 padding = 0;
+ gboolean have_options = FALSE;
+ /* Size of base header */
block_total_length = sizeof(struct shb) +
sizeof(guint32);
- if ((strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
- block_total_length += 2 * sizeof(struct option) +
+ if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
+ block_total_length += sizeof(struct option) +
+ (guint16)(ADD_PADDING(strlen(comment) + 1));
+ have_options = TRUE;
+ }
+ if ((hw != NULL) && (strlen(hw) > 0) && (strlen(hw) < G_MAXUINT16)) {
+ block_total_length += sizeof(struct option) +
+ (guint16)(ADD_PADDING(strlen(hw) + 1));
+ have_options = TRUE;
+ }
+ if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
+ block_total_length += sizeof(struct option) +
+ (guint16)(ADD_PADDING(strlen(os) + 1));
+ have_options = TRUE;
+ }
+ if ((appname != NULL) && (strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
+ block_total_length += sizeof(struct option) +
(guint16)(ADD_PADDING(strlen(appname) + 1));
+ have_options = TRUE;
+ }
+ /* If we have options add size of end-of-options */
+ if (have_options) {
+ block_total_length += sizeof(struct option);
}
/* write shb header */
shb.block_type = SECTION_HEADER_BLOCK_TYPE;
shb.byte_order_magic = PCAPNG_MAGIC;
shb.major_version = PCAPNG_MAJOR_VERSION;
shb.minor_version = PCAPNG_MINOR_VERSION;
- shb.section_length = -1;
+ shb.section_length = section_length;
WRITE_DATA(fp, &shb, sizeof(struct shb), *bytes_written, err);
- if ((strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
+ if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
+ /* write opt_comment options */
+ option.type = OPT_COMMENT;
+ option.value_length = (guint16)(strlen(comment) + 1);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, comment, strlen(comment) + 1, *bytes_written, err);
+ if ((strlen(comment) + 1) % 4) {
+ WRITE_DATA(fp, &padding, 4 - (strlen(comment) + 1) % 4, *bytes_written, err);
+ }
+ }
+ if ((hw != NULL) && (strlen(hw) > 0) && (strlen(hw) < G_MAXUINT16)) {
+ /* write shb_hardware options */
+ option.type = SHB_HARDWARE;
+ option.value_length = (guint16)(strlen(hw) + 1);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, hw, strlen(hw) + 1, *bytes_written, err);
+ if ((strlen(hw) + 1) % 4) {
+ WRITE_DATA(fp, &padding, 4 - (strlen(hw) + 1) % 4, *bytes_written, err);
+ }
+ }
+ if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
+ /* write shb_os options */
+ option.type = SHB_OS;
+ option.value_length = (guint16)(strlen(os) + 1);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, os, strlen(os) + 1, *bytes_written, err);
+ if ((strlen(os) + 1) % 4) {
+ WRITE_DATA(fp, &padding, 4 - (strlen(os) + 1) % 4, *bytes_written, err);
+ }
+ }
+ if ((appname != NULL) && (strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
/* write shb_userappl options */
option.type = SHB_USERAPPL;
option.value_length = (guint16)(strlen(appname) + 1);
if ((strlen(appname) + 1) % 4) {
WRITE_DATA(fp, &padding, 4 - (strlen(appname) + 1) % 4, *bytes_written, err);
}
- /* write last option */
+ }
+ if (have_options) {
+ /* write end of 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;
gboolean
libpcap_write_interface_description_block(FILE *fp,
- const char *name,
- const char *filter,
+ const char *comment, /* OPT_COMMENT 1 */
+ const char *name, /* IDB_NAME 2 */
+ const char *descr, /* IDB_DESCRIPTION 3 */
+ const char *filter, /* IDB_FILTER 11 */
+ const char *os, /* IDB_OS 12 */
int link_type,
int snap_len,
long *bytes_written,
+ guint64 if_speed, /* IDB_IF_SPEED 8 */
+ guint8 tsresol, /* IDB_TSRESOL 9 */
int *err)
{
struct idb idb;
struct option option;
guint32 block_total_length;
const guint32 padding = 0;
+ gboolean have_options = FALSE;
block_total_length = sizeof(struct idb) + sizeof(guint32);
- if ((strlen(name) > 0) && (strlen(name) < G_MAXUINT16)) {
+ /* OPT_COMMENT */
+ if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
+ block_total_length += sizeof(struct option) +
+ (guint16)(ADD_PADDING(strlen(comment) + 1));
+ have_options = TRUE;
+ }
+
+ /* IDB_DESCRIPTION */
+ if ((descr != NULL) && (strlen(descr) > 0) && (strlen(descr) < G_MAXUINT16)) {
+ block_total_length += sizeof(struct option) +
+ (guint16)(ADD_PADDING(strlen(descr) + 1));
+ have_options = TRUE;
+ }
+
+ /* IDB_NAME */
+ if ((name != NULL) && (strlen(name) > 0) && (strlen(name) < G_MAXUINT16)) {
block_total_length += sizeof(struct option) +
(guint16)(ADD_PADDING(strlen(name) + 1));
+ have_options = TRUE;
}
- if ((strlen(filter) > 0) && (strlen(name) < G_MAXUINT16)) {
+
+ /* IDB_FILTER */
+ if ((filter != NULL) && (strlen(filter) > 0) && (strlen(filter) < G_MAXUINT16)) {
block_total_length += sizeof(struct option) +
(guint16)(ADD_PADDING(strlen(filter) + 1));
+ have_options = TRUE;
+ }
+
+ /* IDB_OS */
+ if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
+ block_total_length += sizeof(struct option) +
+ (guint16)(ADD_PADDING(strlen(os) + 1));
+ have_options = TRUE;
}
- if (((strlen(name) > 0) && (strlen(name) < G_MAXUINT16)) ||
- ((strlen(filter) > 0) && (strlen(name) < G_MAXUINT16))) {
+
+ /* IDB_IF_SPEED 8 */
+ if (if_speed != 0) {
+ block_total_length += sizeof(struct option) + sizeof(guint64);
+ have_options = TRUE;
+ }
+
+ /* IDB_TSRESOL 9 */
+ if (tsresol != 0) {
+ block_total_length += sizeof(struct option) + sizeof(struct option);
+ have_options = TRUE;
+ }
+
+ /* If we have options add size of end-of-options */
+ if (have_options) {
block_total_length += sizeof(struct option);
}
+
/* write block header */
idb.block_type = INTERFACE_DESCRIPTION_BLOCK_TYPE;
idb.block_total_length = block_total_length;
idb.reserved = 0;
idb.snap_len = snap_len;
WRITE_DATA(fp, &idb, sizeof(struct idb), *bytes_written, err);
+
+ /* write comment string if applicable */
+ if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
+ option.type = OPT_COMMENT;
+ option.value_length = (guint16)(strlen(comment) + 1);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, comment, strlen(comment) + 1, *bytes_written, err);
+ if ((strlen(comment) + 1) % 4) {
+ WRITE_DATA(fp, &padding, 4 - (strlen(comment) + 1) % 4 , *bytes_written, err);
+ }
+ }
+
/* write interface name string if applicable */
- if ((strlen(name) > 0) && (strlen(name) < G_MAXUINT16)) {
+ if ((name != NULL) && (strlen(name) > 0) && (strlen(name) < G_MAXUINT16)) {
option.type = IDB_NAME;
option.value_length = (guint16)(strlen(name) + 1);
WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
WRITE_DATA(fp, &padding, 4 - (strlen(name) + 1) % 4 , *bytes_written, err);
}
}
+
+ /* write interface description string if applicable */
+ if ((descr != NULL) && (strlen(descr) > 0) && (strlen(descr) < G_MAXUINT16)) {
+ option.type = IDB_DESCRIPTION;
+ option.value_length = (guint16)(strlen(descr) + 1);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, name, strlen(descr) + 1, *bytes_written, err);
+ if ((strlen(descr) + 1) % 4) {
+ WRITE_DATA(fp, &padding, 4 - (strlen(descr) + 1) % 4 , *bytes_written, err);
+ }
+ }
+
/* write filter string if applicable */
- if ((strlen(filter) > 0) && (strlen(filter) < G_MAXUINT16)) {
+ if ((filter != NULL) && (strlen(filter) > 0) && (strlen(filter) < G_MAXUINT16)) {
option.type = IDB_FILTER;
option.value_length = (guint16)(strlen(filter) + 1);
WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
WRITE_DATA(fp, &padding, 4 - (strlen(filter) + 1) % 4 , *bytes_written, err);
}
}
- /* write endofopt option if there were any options */
- if (((strlen(name) > 0) && (strlen(name) < G_MAXUINT16)) ||
- ((strlen(filter) > 0) && (strlen(filter) < G_MAXUINT16))) {
+
+ /* write os string if applicable */
+ if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
+ option.type = IDB_OS;
+ option.value_length = (guint16)(strlen(os) + 1);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, os, strlen(os) + 1, *bytes_written, err);
+ if ((strlen(os) + 1) % 4) {
+ WRITE_DATA(fp, &padding, 4 - (strlen(os) + 1) % 4 , *bytes_written, err);
+ }
+ }
+
+ /* IDB_IF_SPEED 8 */
+ if (if_speed != 0) {
+ option.type = IDB_IF_SPEED;
+ option.value_length = sizeof(guint64);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, &if_speed, sizeof(guint64), *bytes_written, err);
+ }
+
+ /* IDB_TSRESOL 9 */
+ if (tsresol != 0) {
+ option.type = IDB_TSRESOL;
+ option.value_length = sizeof(guint8);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, &tsresol, sizeof(guint8), *bytes_written, err);
+ WRITE_DATA(fp, &padding, 3 , *bytes_written, err);
+ }
+
+ if (have_options) {
+ /* write end of 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;
guint32 interface_id,
pcap_t *pd,
long *bytes_written,
+ const char *comment, /* OPT_COMMENT 1 */
+ guint64 isb_starttime, /* ISB_STARTTIME 2 */
+ guint64 isb_endtime, /* ISB_ENDTIME 3 */
int *err)
{
struct isb isb;
guint64 timestamp;
guint64 counter;
gboolean stats_retrieved;
-
+ gboolean have_options = FALSE;
+ const guint32 padding = 0;
#ifdef _WIN32
/*
* Current time, represented as 100-nanosecond intervals since
g_warning("pcap_stats() failed.");
} else {
stats_retrieved = TRUE;
+ have_options = TRUE;
}
block_total_length = sizeof(struct isb) +
sizeof(guint32);
if (stats_retrieved) {
- block_total_length += 3 * sizeof(struct option) + 2 * sizeof(guint64);
+ block_total_length += 2 * sizeof(struct option) + 2 * sizeof(guint64); /* ISB_IFRECV + ISB_IFDROP */
}
+ /* OPT_COMMENT */
+ if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
+ block_total_length += sizeof(struct option) +
+ (guint16)(ADD_PADDING(strlen(comment) + 1));
+ have_options = TRUE;
+ }
+ if (isb_starttime !=0) {
+ block_total_length += sizeof(struct option) + sizeof(guint64); /* ISB_STARTTIME */
+ have_options = TRUE;
+ }
+ if (isb_endtime !=0) {
+ block_total_length += sizeof(struct option) + sizeof(guint64); /* ISB_ENDTIME */
+ have_options = TRUE;
+ }
+ /* If we have options add size of end-of-options */
+ if (have_options) {
+ block_total_length += sizeof(struct option);
+ }
+
isb.block_type = INTERFACE_STATISTICS_BLOCK_TYPE;
isb.block_total_length = block_total_length;
isb.interface_id = interface_id;
isb.timestamp_high = (guint32)((timestamp>>32) & 0xffffffff);
isb.timestamp_low = (guint32)(timestamp & 0xffffffff);
WRITE_DATA(fp, &isb, sizeof(struct isb), *bytes_written, err);
+
+ /* write comment string if applicable */
+ if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
+ option.type = OPT_COMMENT;
+ option.value_length = (guint16)(strlen(comment) + 1);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, comment, strlen(comment) + 1, *bytes_written, err);
+ if ((strlen(comment) + 1) % 4) {
+ WRITE_DATA(fp, &padding, 4 - (strlen(comment) + 1) % 4 , *bytes_written, err);
+ }
+ }
+
+ if (isb_starttime !=0) {
+ option.type = ISB_STARTTIME;
+ option.value_length = sizeof(guint64);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, &isb_starttime, sizeof(guint64), *bytes_written, err);
+ }
+ if (isb_endtime !=0) {
+ option.type = ISB_ENDTIME;
+ option.value_length = sizeof(guint64);
+ WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ WRITE_DATA(fp, &isb_endtime, sizeof(guint64), *bytes_written, err);
+ }
if (stats_retrieved) {
/* */
option.type = ISB_IFRECV;
counter = stats.ps_drop;
WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
WRITE_DATA(fp, &counter, sizeof(guint64), *bytes_written, err);
- /* last option */
+ }
+ if (have_options) {
+ /* write end of options */
option.type = OPT_ENDOFOPT;
option.value_length = 0;
WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
}
+
WRITE_DATA(fp, &block_total_length, sizeof(guint32), *bytes_written, err);
return TRUE;
git.samba.org / obnox / wireshark / wip.git / blobdiff