Changeset 9cecdb2 for lib


Ignore:
Timestamp:
11/24/05 12:00:55 (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:
79dbcef
Parents:
f66a4933
Message:

updated Changelog
fixed anonymous definition of packet status struct, to improve use.
updated format_erf paths to use sizeof(libtrace_packet_status_t)

Location:
lib
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • lib/format_erf.c

    rf66a4933 r9cecdb2  
    674674                        // Need to skip this packet as it is a message packet
    675675                        tracefifo_out_update(libtrace->fifo, packet->size);
    676                         tracefifo_ack_update(libtrace->fifo, packet->size + (sizeof(uint32_t) * 2));
     676                        tracefifo_ack_update(libtrace->fifo, packet->size +
     677                                        sizeof(uint32_t) +
     678                                        sizeof(libtrace_packet_status_t));
    677679                        continue;
    678680                }
     
    691693                tracefifo_out_update(libtrace->fifo,packet->size);
    692694
    693                 tracefifo_ack_update(libtrace->fifo,packet->size + (sizeof(uint32_t) * 2));
     695                tracefifo_ack_update(libtrace->fifo,packet->size +
     696                                sizeof(uint32_t) +
     697                                sizeof(libtrace_packet_status_t));
    694698
    695699                //packet->size = numbytes;
  • lib/libtrace.h

    r5a67294 r9cecdb2  
    8787typedef struct libtrace_filter_t libtrace_filter_t;
    8888
     89/** Structure holding status information for a packet */
     90typedef struct libtrace_packet_status {
     91        uint8_t type;
     92        uint8_t reserved;
     93        uint16_t message;
     94
     95} libtrace_packet_status_t;
     96
    8997/** Structure holding information about a packet */
    9098#define LIBTRACE_PACKET_BUFSIZE 65536
     
    94102        char buffer[LIBTRACE_PACKET_BUFSIZE];
    95103        size_t size;
    96         struct {
    97                 uint8_t type;
    98                 uint8_t reserved;
    99                 uint16_t message;
    100         } status;
     104        libtrace_packet_status_t status;
    101105} __attribute__ ((packed)) libtrace_packet_t;
    102106                     
Note: See TracChangeset for help on using the changeset viewer.