diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-09-29 20:26:25 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-09-29 20:26:25 +0000 |
| commit | c42263f28aa2446b5c205a716f6218b0d8896123 (patch) | |
| tree | 57eaeca8b0df376e376993b4ed28abf2d49de21a /pcapio.h | |
| parent | 9b2ecdc9a712ee9df4c52b53a5f132c05e2e5182 (diff) | |
We always write to a FILE *, so:
make libpcap_write_to_file() static;
don't pass it as an argument to write routines, just have them
call it directly;
make the handle argument a FILE *.
Make the data length argument to libpcap_write_to_file() a size_t, as
that's what, for example, fwrite() takes as a size argument.
svn path=/trunk/; revision=52274
Diffstat (limited to 'pcapio.h')
| -rw-r--r-- | pcapio.h | 23 |
1 files changed, 6 insertions, 17 deletions
@@ -25,28 +25,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -typedef gboolean (*libpcap_write_t) (void* write_data_info, const guint8* data, long data_length, - guint64 *bytes_written, int *err); - -/* Write libcap to file. write_data_info will be a FILE* */ -extern gboolean libpcap_write_to_file(void* write_data_info, - const guint8* data, - long data_length, - guint64 *bytes_written, - int *err); - - /** 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*/ extern gboolean -libpcap_write_file_header(libpcap_write_t write_func, void* write_data_info, int linktype, int snaplen, +libpcap_write_file_header(FILE* pfile, int linktype, int snaplen, gboolean ts_nsecs, guint64 *bytes_written, int *err); /** Write a record for a packet to a dump file. Returns TRUE on success, FALSE on failure. */ extern gboolean -libpcap_write_packet(libpcap_write_t write_func, void* write_data_info, +libpcap_write_packet(FILE* pfile, time_t sec, guint32 usec, guint32 caplen, guint32 len, const guint8 *pd, @@ -56,7 +45,7 @@ libpcap_write_packet(libpcap_write_t write_func, void* write_data_info, * */ extern gboolean -libpcap_write_session_header_block(libpcap_write_t write_func, void* write_data_info, /**< Write information */ +libpcap_write_session_header_block(FILE* pfile, /**< Write information */ const char *comment, /**< Comment on the section, Optinon 1 opt_comment * A UTF-8 string containing a comment that is associated to the current block. */ @@ -74,7 +63,7 @@ libpcap_write_session_header_block(libpcap_write_t write_func, void* write_data_ int *err); extern gboolean -libpcap_write_interface_description_block(libpcap_write_t write_func, void* write_data_info, +libpcap_write_interface_description_block(FILE* pfile, const char *comment, /* OPT_COMMENT 1 */ const char *name, /* IDB_NAME 2 */ const char *descr, /* IDB_DESCRIPTION 3 */ @@ -88,7 +77,7 @@ libpcap_write_interface_description_block(libpcap_write_t write_func, void* writ int *err); extern gboolean -libpcap_write_interface_statistics_block(libpcap_write_t write_func, void* write_data_info, +libpcap_write_interface_statistics_block(FILE* pfile, guint32 interface_id, guint64 *bytes_written, const char *comment, /* OPT_COMMENT 1 */ @@ -99,7 +88,7 @@ libpcap_write_interface_statistics_block(libpcap_write_t write_func, void* write int *err); extern gboolean -libpcap_write_enhanced_packet_block(libpcap_write_t write_func, void* write_data_info, +libpcap_write_enhanced_packet_block(FILE* pfile, const char *comment, time_t sec, guint32 usec, guint32 caplen, guint32 len, |