#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) \
-{ \
- do { \
- size_t nwritten; \
- \
- nwritten = fwrite(data_pointer, data_length, 1, file_pointer); \
- if (nwritten != 1) { \
- if (ferror(file_pointer)) { \
- *error_pointer = errno; \
- } else { \
- *error_pointer = 0; \
- } \
- return FALSE; \
- } \
- written_length += (long)nwritten; \
- } while (0); \
+/* Write libcap to file. write_data_info will be a FILE* */
+gboolean libpcap_write_to_file(void* write_data_info,
+ const guint8* data,
+ long data_length,
+ guint64 *bytes_written,
+ int *err)
+{
+ size_t nwritten;
+ FILE* pFile = (FILE*)write_data_info;
+
+ nwritten = fwrite(data, data_length, 1, pFile);
+ if (nwritten != 1) {
+ if (ferror(pFile)) {
+ *err = errno;
+ } else {
+ *err = 0;
+ }
+ return FALSE;
+ }
+
+ (*bytes_written) += data_length;
+ return TRUE;
}
/* Write the file header to a dump file.
Returns TRUE on success, FALSE on failure.
Sets "*err" to an error code, or 0 for a short write, on failure*/
gboolean
-libpcap_write_file_header(FILE *fp, int linktype, int snaplen, gboolean ts_nsecs, long *bytes_written, int *err)
+libpcap_write_file_header(libpcap_write_t write_func, void* write_data_info, int linktype, int snaplen, gboolean ts_nsecs, guint64 *bytes_written, int *err)
{
struct pcap_hdr file_hdr;
- size_t nwritten;
file_hdr.magic = ts_nsecs ? PCAP_NSEC_MAGIC : PCAP_MAGIC;
/* current "libpcap" format is 2.4 */
file_hdr.sigfigs = 0; /* unknown, but also apparently unused */
file_hdr.snaplen = snaplen;
file_hdr.network = linktype;
- nwritten = fwrite(&file_hdr, sizeof(file_hdr), 1, fp);
- if (nwritten != 1) {
- if (ferror(fp))
- *err = errno;
- else
- *err = 0; /* short write */
- return FALSE;
- }
- *bytes_written += sizeof(file_hdr);
- return TRUE;
+ return write_func(write_data_info, (const guint8*)&file_hdr, sizeof(file_hdr), bytes_written, err);
}
/* Write a record for a packet to a dump file.
Returns TRUE on success, FALSE on failure. */
gboolean
-libpcap_write_packet(FILE *fp,
- guint32 sec, guint32 usec,
+libpcap_write_packet(libpcap_write_t write_func, void* write_data_info,
+ time_t sec, guint32 usec,
guint32 caplen, guint32 len,
- const unsigned char *pd,
- long *bytes_written, int *err)
+ const guint8 *pd,
+ guint64 *bytes_written, int *err)
{
struct pcaprec_hdr rec_hdr;
- size_t nwritten;
- rec_hdr.ts_sec = sec;
+ rec_hdr.ts_sec = (guint32)sec; /* Y2.038K issue in pcap format.... */
rec_hdr.ts_usec = usec;
rec_hdr.incl_len = caplen;
rec_hdr.orig_len = len;
- nwritten = fwrite(&rec_hdr, sizeof(rec_hdr), 1, fp);
- if (nwritten != 1) {
- if (ferror(fp))
- *err = errno;
- else
- *err = 0; /* short write */
+ if (!write_func(write_data_info, (const guint8*)&rec_hdr, sizeof(rec_hdr), bytes_written, err))
return FALSE;
- }
- *bytes_written += sizeof rec_hdr;
- nwritten = fwrite(pd, caplen, 1, fp);
- if (nwritten != 1) {
- if (ferror(fp))
- *err = errno;
- else
- *err = 0; /* short write */
- return FALSE;
- }
- *bytes_written += caplen;
- return TRUE;
+ return write_func(write_data_info, pd, caplen, bytes_written, err);
}
gboolean
-libpcap_write_session_header_block(FILE *fp,
+libpcap_write_session_header_block(libpcap_write_t write_func, void* write_data_info,
const char *comment,
const char *hw,
const char *os,
const char *appname,
guint64 section_length,
- long *bytes_written,
+ guint64 *bytes_written,
int *err)
{
struct shb shb;
block_total_length = sizeof(struct shb) +
sizeof(guint32);
if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(comment));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(comment)));
have_options = TRUE;
}
if ((hw != NULL) && (strlen(hw) > 0) && (strlen(hw) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(hw));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(hw)));
have_options = TRUE;
}
if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(os));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(os)));
have_options = TRUE;
}
if ((appname != NULL) && (strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(appname));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(appname)));
have_options = TRUE;
}
/* If we have options add size of end-of-options */
if (have_options) {
- block_total_length += sizeof(struct option);
+ block_total_length += (guint32)sizeof(struct option);
}
/* write shb header */
shb.block_type = SECTION_HEADER_BLOCK_TYPE;
shb.major_version = PCAPNG_MAJOR_VERSION;
shb.minor_version = PCAPNG_MINOR_VERSION;
shb.section_length = section_length;
- WRITE_DATA(fp, &shb, sizeof(struct shb), *bytes_written, err);
+
+ if (!write_func(write_data_info, (const guint8*)&shb, sizeof(struct shb), bytes_written, err))
+ return FALSE;
if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
/* write opt_comment options */
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 (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)comment, (int) strlen(comment), bytes_written, err))
+ return FALSE;
+
if (strlen(comment) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(comment) % 4, *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(comment) % 4, bytes_written, err))
+ return FALSE;
}
}
if ((hw != NULL) && (strlen(hw) > 0) && (strlen(hw) < G_MAXUINT16)) {
/* write shb_hardware options */
option.type = SHB_HARDWARE;
option.value_length = (guint16)strlen(hw);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, hw, strlen(hw), *bytes_written, err);
+
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)hw, (int) strlen(hw), bytes_written, err))
+ return FALSE;
+
if ((strlen(hw) + 1) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(hw) % 4, *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(hw) % 4, bytes_written, err))
+ return FALSE;
}
}
if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
/* write shb_os options */
option.type = SHB_OS;
option.value_length = (guint16)strlen(os);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, os, strlen(os), *bytes_written, err);
+
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)os, (int) strlen(os), bytes_written, err))
+ return FALSE;
+
if (strlen(os) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(os) % 4, *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(os) % 4, bytes_written, err))
+ return FALSE;
}
}
if ((appname != NULL) && (strlen(appname) > 0) && (strlen(appname) < G_MAXUINT16)) {
/* write shb_userappl options */
option.type = SHB_USERAPPL;
option.value_length = (guint16)strlen(appname);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, appname, strlen(appname), *bytes_written, err);
+
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)appname, (int) strlen(appname), bytes_written, err))
+ return FALSE;
+
if (strlen(appname) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(appname) % 4, *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(appname) % 4, bytes_written, err))
+ return FALSE;
}
}
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);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
}
/* write the trailing block total length */
- WRITE_DATA(fp, &block_total_length, sizeof(guint32), *bytes_written, err);
- return TRUE;
+ return write_func(write_data_info, (const guint8*)&block_total_length, sizeof(guint32), bytes_written, err);
}
gboolean
-libpcap_write_interface_description_block(FILE *fp,
+libpcap_write_interface_description_block(libpcap_write_t write_func, void* write_data_info,
const char *comment, /* OPT_COMMENT 1 */
const char *name, /* IDB_NAME 2 */
const char *descr, /* IDB_DESCRIPTION 3 */
const char *os, /* IDB_OS 12 */
int link_type,
int snap_len,
- long *bytes_written,
+ guint64 *bytes_written,
guint64 if_speed, /* IDB_IF_SPEED 8 */
guint8 tsresol, /* IDB_TSRESOL 9 */
int *err)
const guint32 padding = 0;
gboolean have_options = FALSE;
- block_total_length = sizeof(struct idb) + sizeof(guint32);
+ block_total_length = (guint32)(sizeof(struct idb) + sizeof(guint32));
/* 01 - OPT_COMMENT */
if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(comment));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(comment)));
have_options = TRUE;
}
/* 02 - IDB_NAME */
if ((name != NULL) && (strlen(name) > 0) && (strlen(name) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(name));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(name)));
have_options = TRUE;
}
/* 03 - IDB_DESCRIPTION */
if ((descr != NULL) && (strlen(descr) > 0) && (strlen(descr) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(descr));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(descr)));
have_options = TRUE;
}
/* 08 - IDB_IF_SPEED */
if (if_speed != 0) {
- block_total_length += sizeof(struct option) + sizeof(guint64);
+ block_total_length += (guint32)(sizeof(struct option) +
+ sizeof(guint64));
have_options = TRUE;
}
/* 09 - IDB_TSRESOL */
if (tsresol != 0) {
- block_total_length += sizeof(struct option) + sizeof(struct option);
+ block_total_length += (guint32)(sizeof(struct option) +
+ sizeof(struct option));
have_options = TRUE;
}
/* 11 - IDB_FILTER */
if ((filter != NULL) && (strlen(filter) > 0) && (strlen(filter) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)(ADD_PADDING(strlen(filter)+ 1));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)(ADD_PADDING(strlen(filter)+ 1)));
have_options = TRUE;
}
/* 12 - IDB_OS */
if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(os));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(os)));
have_options = TRUE;
}
/* If we have options add size of end-of-options */
if (have_options) {
- block_total_length += sizeof(struct option);
+ block_total_length += (guint32)sizeof(struct option);
}
/* write block header */
idb.link_type = link_type;
idb.reserved = 0;
idb.snap_len = snap_len;
- WRITE_DATA(fp, &idb, sizeof(struct idb), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&idb, sizeof(struct idb), bytes_written, err))
+ return FALSE;
/* 01 - OPT_COMMENT - 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);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, comment, strlen(comment), *bytes_written, err);
+
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)comment, (int) strlen(comment), bytes_written, err))
+ return FALSE;
+
if (strlen(comment) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(comment) % 4 , *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(comment) % 4, bytes_written, err))
+ return FALSE;
}
}
if ((name != NULL) && (strlen(name) > 0) && (strlen(name) < G_MAXUINT16)) {
option.type = IDB_NAME;
option.value_length = (guint16)strlen(name);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, name, strlen(name), *bytes_written, err);
+
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)name, (int) strlen(name), bytes_written, err))
+ return FALSE;
+
if (strlen(name) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(name) % 4 , *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(name) % 4, bytes_written, err))
+ return FALSE;
}
}
if ((descr != NULL) && (strlen(descr) > 0) && (strlen(descr) < G_MAXUINT16)) {
option.type = IDB_DESCRIPTION;
option.value_length = (guint16)strlen(descr);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, descr, strlen(descr), *bytes_written, err);
+
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)descr, (int) strlen(descr), bytes_written, err))
+ return FALSE;
+
if (strlen(descr) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(descr) % 4 , *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(descr) % 4, bytes_written, err))
+ return FALSE;
}
}
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);
+
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&if_speed, sizeof(guint64), bytes_written, err))
+ return FALSE;
}
/* 09 - IDB_TSRESOL */
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 (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&tsresol, sizeof(guint8), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&padding, 3, bytes_written, err))
+ return FALSE;
}
/* 11 - IDB_FILTER - write filter string if applicable
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);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
/* The first byte of the Option Data keeps a code of the filter used, 0 = lipbpcap filter string */
- WRITE_DATA(fp, &padding, 1, *bytes_written, err);
- WRITE_DATA(fp, filter, strlen(filter), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 1, bytes_written, err))
+ return FALSE;
+ if (!write_func(write_data_info, (const guint8*)filter, (int) strlen(filter), bytes_written, err))
+ return FALSE;
if ((strlen(filter) + 1) % 4) {
- WRITE_DATA(fp, &padding, 4 - (strlen(filter) + 1) % 4 , *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - (strlen(filter) + 1) % 4, bytes_written, err))
+ return FALSE;
}
}
if ((os != NULL) && (strlen(os) > 0) && (strlen(os) < G_MAXUINT16)) {
option.type = IDB_OS;
option.value_length = (guint16)strlen(os);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, os, strlen(os), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+ if (!write_func(write_data_info, (const guint8*)os, (int) strlen(os), bytes_written, err))
+ return FALSE;
if (strlen(os) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(os) % 4 , *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(os) % 4, bytes_written, err))
+ return FALSE;
}
}
/* write end of options */
option.type = OPT_ENDOFOPT;
option.value_length = 0;
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
}
/* write the trailing Block Total Length */
- WRITE_DATA(fp, &block_total_length, sizeof(guint32), *bytes_written, err);
- return TRUE;
+ return write_func(write_data_info, (const guint8*)&block_total_length, sizeof(guint32), bytes_written, err);
}
/* Write a record for a packet to a dump file.
Returns TRUE on success, FALSE on failure. */
gboolean
-libpcap_write_enhanced_packet_block(FILE *fp,
- guint32 sec, guint32 usec,
+libpcap_write_enhanced_packet_block(libpcap_write_t write_func, void* write_data_info,
+ const char *comment,
+ time_t sec, guint32 usec,
guint32 caplen, guint32 len,
guint32 interface_id,
guint ts_mul,
- const unsigned char *pd,
+ const guint8 *pd,
guint32 flags,
- long *bytes_written,
+ guint64 *bytes_written,
int *err)
{
struct epb epb;
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);
+ block_total_length = (guint32)(sizeof(struct epb) +
+ ADD_PADDING(caplen) +
+ sizeof(guint32));
+ if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(comment)));
+ have_options = TRUE;
+ }
if (flags != 0) {
- block_total_length += 2 * sizeof(struct option) + sizeof(guint32);
+ block_total_length += (guint32)(sizeof(struct option) +
+ sizeof(guint32));
+ have_options = TRUE;
+ }
+ /* If we have options add size of end-of-options */
+ if (have_options) {
+ block_total_length += (guint32)sizeof(struct option);
}
timestamp = (guint64)sec * ts_mul + (guint64)usec;
epb.block_type = ENHANCED_PACKET_BLOCK_TYPE;
epb.timestamp_low = (guint32)(timestamp & 0xffffffff);
epb.captured_len = caplen;
epb.packet_len = len;
- WRITE_DATA(fp, &epb, sizeof(struct epb), *bytes_written, err);
- WRITE_DATA(fp, pd, caplen, *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&epb, sizeof(struct epb), bytes_written, err))
+ return FALSE;
+ if (!write_func(write_data_info, pd, caplen, bytes_written, err))
+ return FALSE;
if (caplen % 4) {
- WRITE_DATA(fp, &padding, 4 - caplen % 4, *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - caplen % 4, bytes_written, err))
+ return FALSE;
+ }
+ if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
+ option.type = OPT_COMMENT;
+ option.value_length = (guint16)strlen(comment);
+
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)comment, (int) strlen(comment), bytes_written, err))
+ return FALSE;
+
+ if (strlen(comment) % 4) {
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(comment) % 4, bytes_written, err))
+ return FALSE;
+ }
}
if (flags != 0) {
option.type = EPB_FLAGS;
option.value_length = sizeof(guint32);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, &flags, sizeof(guint32), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+ if (!write_func(write_data_info, (const guint8*)&flags, sizeof(guint32), bytes_written, err))
+ return FALSE;
option.type = OPT_ENDOFOPT;
option.value_length = 0;
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
}
- WRITE_DATA(fp, &block_total_length, sizeof(guint32), *bytes_written, err);
- return TRUE;
+
+ return write_func(write_data_info, (const guint8*)&block_total_length, sizeof(guint32), bytes_written, err);
}
gboolean
-libpcap_write_interface_statistics_block(FILE *fp,
+libpcap_write_interface_statistics_block(libpcap_write_t write_func, void* write_data_info,
guint32 interface_id,
- long *bytes_written,
+ guint64 *bytes_written,
const char *comment, /* OPT_COMMENT 1 */
guint64 isb_starttime, /* ISB_STARTTIME 2 */
guint64 isb_endtime, /* ISB_ENDTIME 3 */
timestamp = (guint64)(now.tv_sec) * 1000000 +
(guint64)(now.tv_usec);
#endif
- block_total_length = sizeof(struct isb) + sizeof(guint32);
+ block_total_length = (guint32)(sizeof(struct isb) + sizeof(guint32));
if (isb_ifrecv != G_MAXUINT64) {
- block_total_length += sizeof(struct option) + sizeof(guint64);
- have_options = TRUE;
+ block_total_length += (guint32)(sizeof(struct option) +
+ sizeof(guint64));
+ have_options = TRUE;
}
if (isb_ifdrop != G_MAXUINT64) {
- block_total_length += sizeof(struct option) + sizeof(guint64);
- have_options = TRUE;
+ block_total_length += (guint32)(sizeof(struct option) +
+ sizeof(guint64));
+ have_options = TRUE;
}
/* OPT_COMMENT */
if ((comment != NULL) && (strlen(comment) > 0) && (strlen(comment) < G_MAXUINT16)) {
- block_total_length += sizeof(struct option) +
- (guint16)ADD_PADDING(strlen(comment));
+ block_total_length += (guint32)(sizeof(struct option) +
+ (guint16)ADD_PADDING(strlen(comment)));
have_options = TRUE;
}
if (isb_starttime !=0) {
- block_total_length += sizeof(struct option) + sizeof(guint64); /* ISB_STARTTIME */
+ block_total_length += (guint32)(sizeof(struct option) +
+ sizeof(guint64)); /* ISB_STARTTIME */
have_options = TRUE;
}
if (isb_endtime !=0) {
- block_total_length += sizeof(struct option) + sizeof(guint64); /* ISB_ENDTIME */
+ block_total_length += (guint32)(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);
+ block_total_length += (guint32)sizeof(struct option);
}
isb.block_type = INTERFACE_STATISTICS_BLOCK_TYPE;
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);
+ if (!write_func(write_data_info, (const guint8*)&isb, sizeof(struct isb), bytes_written, err))
+ return FALSE;
/* 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);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, comment, strlen(comment), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)comment, (int) strlen(comment), bytes_written, err))
+ return FALSE;
+
if (strlen(comment) % 4) {
- WRITE_DATA(fp, &padding, 4 - strlen(comment) % 4 , *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&padding, 4 - strlen(comment) % 4, bytes_written, err))
+ return FALSE;
}
}
option.value_length = sizeof(guint64);
high = (guint32)((isb_starttime>>32) & 0xffffffff);
low = (guint32)(isb_starttime & 0xffffffff);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, &high, sizeof(guint32), *bytes_written, err);
- WRITE_DATA(fp, &low, sizeof(guint32), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&high, sizeof(guint32), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&low, sizeof(guint32), bytes_written, err))
+ return FALSE;
}
if (isb_endtime !=0) {
guint32 high, low;
option.value_length = sizeof(guint64);
high = (guint32)((isb_endtime>>32) & 0xffffffff);
low = (guint32)(isb_endtime & 0xffffffff);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, &high, sizeof(guint32), *bytes_written, err);
- WRITE_DATA(fp, &low, sizeof(guint32), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&high, sizeof(guint32), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&low, sizeof(guint32), bytes_written, err))
+ return FALSE;
}
if (isb_ifrecv != G_MAXUINT64) {
option.type = ISB_IFRECV;
option.value_length = sizeof(guint64);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, &isb_ifrecv, sizeof(guint64), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&isb_ifrecv, sizeof(guint64), bytes_written, err))
+ return FALSE;
}
if (isb_ifdrop != G_MAXUINT64) {
option.type = ISB_IFDROP;
option.value_length = sizeof(guint64);
- WRITE_DATA(fp, &option, sizeof(struct option), *bytes_written, err);
- WRITE_DATA(fp, &isb_ifdrop, sizeof(guint64), *bytes_written, err);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
+
+ if (!write_func(write_data_info, (const guint8*)&isb_ifdrop, sizeof(guint64), bytes_written, err))
+ return FALSE;
}
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);
+ if (!write_func(write_data_info, (const guint8*)&option, sizeof(struct option), bytes_written, err))
+ return FALSE;
}
- WRITE_DATA(fp, &block_total_length, sizeof(guint32), *bytes_written, err);
-
- return TRUE;
+ return write_func(write_data_info, (const guint8*)&block_total_length, sizeof(guint32), bytes_written, err);
}
/*
git.samba.org / metze / wireshark / wip.git / blobdiff