Changeset 25024fd


Ignore:
Timestamp:
12/03/07 23:10:18 (13 years ago)
Author:
Perry Lorier <perry@…>
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:
4423dc7
Parents:
25a9201
Message:

Rework some structures to avoid padding issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • lib/libtrace_int.h

    r50bbce8 r25024fd  
    119119struct libtrace_event_status_t {
    120120        libtrace_packet_t *packet;
    121         int psize;
    122121        double tdelta;
    123122        double trace_last_ts;
     123        int psize;
    124124};
    125125
     
    129129struct libtrace_t {
    130130        struct libtrace_format_t *format; /**< format driver pointer */
     131        struct libtrace_event_status_t event;   /**< the next event */
    131132        void *format_data;              /**<format data pointer */
    132         bool started;                   /**< if this trace has started */
    133         libtrace_err_t err;             /**< error information */
    134         struct libtrace_event_status_t event;   /**< the next event */
    135133        struct libtrace_filter_t *filter; /**< used by libtrace if the module
    136134                                            * doesn't support filters natively
     
    147145        char *uridata;                  /**< the uri of this trace */
    148146
     147        libtrace_err_t err;             /**< error information */
     148        bool started;                   /**< if this trace has started */
    149149};
    150150
     
    155155        struct libtrace_format_t *format;       /**< format driver */
    156156        void *format_data;              /**< format data */
     157        char *uridata;                  /**< URI associated with this trace */
     158        libtrace_err_t err;             /**< Associated error */
    157159        bool started;                   /**< trace started */
    158         libtrace_err_t err;             /**< Associated error */
    159         char *uridata;                  /**< URI associated with this trace */
    160160};
    161161
     
    198198        uint8_t    dir;
    199199        uint8_t    pad[3];
    200 } libtrace_pflog_header_t;
     200} PACKED libtrace_pflog_header_t;
    201201
    202202
     
    448448struct libtrace_filter_t {
    449449        struct bpf_program filter;
     450        char * filterstring;
    450451        int flag;
    451         char * filterstring;
    452452};
    453453#else
Note: See TracChangeset for help on using the changeset viewer.