Changeset 063c879


Ignore:
Timestamp:
10/11/04 14:48:11 (16 years ago)
Author:
Daniel Lawson <dlawson@…>
Branches:
4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes
Children:
be78902
Parents:
886c3d9
Message:

more fixesin trace_event

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • config.h

    r886c3d9 r063c879  
    1515
    1616/* Define to 1 if you have the <net/bpf.h> header file. */
    17 /* #undef HAVE_NET_BPF_H */
     17#define HAVE_NET_BPF_H 1
    1818
    1919/* Define to 1 if you have the <pcap-bpf.h> header file. */
    20 #define HAVE_PCAP_BPF_H 1
     20/* #undef HAVE_PCAP_BPF_H */
    2121
    2222/* Define to 1 if you have the <pcap.h> header file. */
     
    9999/* #undef const */
    100100
    101 /* Define to `__inline__' or `__inline' if that's what the C compiler
    102    calls it, or to nothing if 'inline' is not supported under any name.  */
    103 #ifndef __cplusplus
     101/* Define as `__inline' if that's what the C compiler calls it, or to nothing
     102   if it is not supported. */
    104103/* #undef inline */
    105 #endif
    106104
    107105/* Define to `unsigned' if <sys/types.h> does not define. */
  • config.h.in

    r2b07596 r063c879  
    9898#undef const
    9999
    100 /* Define to `__inline__' or `__inline' if that's what the C compiler
    101    calls it, or to nothing if 'inline' is not supported under any name.  */
    102 #ifndef __cplusplus
     100/* Define as `__inline' if that's what the C compiler calls it, or to nothing
     101   if it is not supported. */
    103102#undef inline
    104 #endif
    105103
    106104/* Define to `unsigned' if <sys/types.h> does not define. */
  • lib/libtrace.h

    r1a857f1 r063c879  
    358358        TRACE_EVENT_SLEEP,
    359359        TRACE_EVENT_PACKET
    360 } libtrace_event_t;
    361 
    362 typedef struct libtrace_eventobj {
    363         libtrace_event_t type;
     360} libtrace_eventtype_t;
     361
     362struct libtrace_event_t {
     363        libtrace_eventtype_t type;
    364364        int fd;
    365365        double seconds;
    366 } libtrace_eventobj_t;
     366};
    367367
    368368/** process a libtrace event
     
    379379 *  TRACE_EVENT_PACKET  Packet arrived in <buffer> with size <size>
    380380 */
    381 libtrace_eventobj_t trace_event(struct libtrace_t *trace,
     381struct libtrace_event_t trace_event(struct libtrace_t *trace,
    382382                struct libtrace_packet_t *packet);
    383383
  • lib/trace.c

    r37d2975 r063c879  
    10451045 * @author Perry Lorier
    10461046 */
    1047 libtrace_eventobj_t libtrace_event(struct libtrace_t *trace,
     1047struct libtrace_event_t libtrace_event(struct libtrace_t *trace,
    10481048                struct libtrace_packet_t *packet) {
    1049         libtrace_eventobj_t event;
     1049        struct libtrace_event_t event;
    10501050        /* Is there a packet ready? */
    10511051        switch (trace->sourcetype) {
Note: See TracChangeset for help on using the changeset viewer.