Changeset 95ca714 for lib/format_pcap.c


Ignore:
Timestamp:
06/26/18 18:11:38 (3 years ago)
Author:
Shane Alcock <salcock@…>
Branches:
cachetimestamps, develop, master, rc-4.0.4, ringdecrementfix, ringperformance
Children:
f57722d6
Parents:
f9df20e (diff), 32ee9b2 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'flushoutput' into develop

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/format_pcap.c

    r5a70a80 r32ee9b2  
    583583}
    584584
     585static int pcap_flush_output(libtrace_out_t *libtrace) {
     586        return pcap_dump_flush(OUTPUT.trace.dump);
     587}
     588
    585589static int pcapint_write_packet(libtrace_out_t *libtrace,
    586590                libtrace_packet_t *packet)
     
    779783        NULL,                           /* fin_packet */
    780784        pcap_write_packet,              /* write_packet */
     785        pcap_flush_output,              /* flush_output */
    781786        pcap_get_link_type,             /* get_link_type */
    782787        pcapint_get_direction,          /* get_direction */
     
    823828        NULL,                           /* fin_packet */
    824829        pcapint_write_packet,           /* write_packet */
     830        NULL,                           /* flush_output */
    825831        pcap_get_link_type,             /* get_link_type */
    826832        pcapint_get_direction,          /* get_direction */
Note: See TracChangeset for help on using the changeset viewer.