diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-09-29 20:53:13 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-09-29 20:53:13 +0000 |
| commit | b06876390dbea53f974f9c8b86fed50128a8db52 (patch) | |
| tree | b2b4cf70b5e21824d5865951f82085f3fd992ba5 /text2pcap.c | |
| parent | c42263f28aa2446b5c205a716f6218b0d8896123 (diff) | |
Rename routines that write pcap-ng files to "pcapng_xxx" rather than
"libpcap_xxx".
Rename the low-level write routine in pcapio.c to write_to_file(), as
it's used for both pcap and pcap-ng files.
svn path=/trunk/; revision=52275
Diffstat (limited to 'text2pcap.c')
| -rw-r--r-- | text2pcap.c | 74 |
1 files changed, 37 insertions, 37 deletions
diff --git a/text2pcap.c b/text2pcap.c index e90e8ead04..e9b8b1ef96 100644 --- a/text2pcap.c +++ b/text2pcap.c @@ -842,14 +842,14 @@ write_current_packet(gboolean cont) length = 60; } if (use_pcapng) { - success = libpcap_write_enhanced_packet_block(output_file, - NULL, - ts_sec, ts_usec, - length, length, - 0, - 1000000, - packet_buf, direction, - &bytes_written, &err); + success = pcapng_write_enhanced_packet_block(output_file, + NULL, + ts_sec, ts_usec, + length, length, + 0, + 1000000, + packet_buf, direction, + &bytes_written, &err); } else { success = libpcap_write_packet(output_file, ts_sec, ts_usec, @@ -895,27 +895,27 @@ write_file_header (void) char comment[100]; g_snprintf(comment, sizeof(comment), "Generated from input file %s.", input_filename); - success = libpcap_write_session_header_block(output_file, - comment, - NULL, - NULL, - appname, - -1, - &bytes_written, - &err); + success = pcapng_write_session_header_block(output_file, + comment, + NULL, + NULL, + appname, + -1, + &bytes_written, + &err); if (success) { - success = libpcap_write_interface_description_block(output_file, - NULL, - NULL, - NULL, - "", - NULL, - pcap_link_type, - PCAP_SNAPLEN, - &bytes_written, - 0, - 6, - &err); + success = pcapng_write_interface_description_block(output_file, + NULL, + NULL, + NULL, + "", + NULL, + pcap_link_type, + PCAP_SNAPLEN, + &bytes_written, + 0, + 6, + &err); } } else { success = libpcap_write_file_header(output_file, pcap_link_type, PCAP_SNAPLEN, @@ -935,15 +935,15 @@ write_file_trailer (void) gboolean success; if (use_pcapng) { - success = libpcap_write_interface_statistics_block(output_file, - 0, - &bytes_written, - "Counters provided by text2pcap", - 0, - 0, - num_packets_written, - num_packets_written - num_packets_written, - &err); + success = pcapng_write_interface_statistics_block(output_file, + 0, + &bytes_written, + "Counters provided by text2pcap", + 0, + 0, + num_packets_written, + num_packets_written - num_packets_written, + &err); } else { success = TRUE; |