Changeset 52f8fc2 for lib/trace.c

Timestamp:

02/23/06 13:14:32 (16 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:

8ea5b38

Parents:

aa62105

Message:

Cleanup some uses of packet->trace where the trace is already available!

File:

• lib/trace.c (modified) (6 diffs)

lib/trace.c

@@ -558 +558 @@
  *
  */
-int trace_read_packet(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) {
+int trace_read_packet(libtrace_t *libtrace, libtrace_packet_t *packet) {
 
         assert(libtrace && "You called trace_read_packet() with a NULL libtrace parameter!\n");
@@ -1027 +1027 @@
  * @author Daniel Lawson
  */ 
-uint64_t trace_get_erf_timestamp(const struct libtrace_packet_t *packet) {
+uint64_t trace_get_erf_timestamp(const libtrace_packet_t *packet) {
         uint64_t timestamp = 0;
         double seconds = 0.0;
@@ -1058 +1058 @@
  * @author Perry Lorier
  */ 
-struct timeval trace_get_timeval(const struct libtrace_packet_t *packet) {
+struct timeval trace_get_timeval(const libtrace_packet_t *packet) {
         struct timeval tv;
         uint64_t ts = 0;
@@ -1121 +1121 @@
 }
 
-/* Get the size of the packet in the trace
- * @param packet        the packet opaque pointer
- * @returns the size of the packet in the trace
- * @author Perry Lorier
- * @note The return size refers to the network-level payload of the packet and
- * does not include any capture headers. For example, an Ethernet packet with
- * an empty TCP packet will return sizeof(ethernet_header) + sizeof(ip_header)
- * + sizeof(tcp_header).
- * @note Due to this being a header capture, or anonymisation, this may not
- * be the same size as the original packet.  See trace_get_wire_length() for the 
- * original size of the packet.
- * @note This can (and often is) different for different packets in a trace!
- * @note This is sometimes called the "snaplen".
- */ 
 int trace_get_capture_length(const struct libtrace_packet_t *packet) {
 
@@ -1173 +1159 @@
  */ 
 SIMPLE_FUNCTION
-int trace_get_framing_length(const struct libtrace_packet_t *packet) {
+int trace_get_framing_length(const libtrace_packet_t *packet) {
         if (packet->trace->format->get_framing_length) {
                 return packet->trace->format->get_framing_length(packet);
@@ -1187 +1173 @@
  * @author Daniel Lawson
  */
-libtrace_linktype_t trace_get_link_type(const struct libtrace_packet_t *packet ) {
+libtrace_linktype_t trace_get_link_type(const libtrace_packet_t *packet ) {
         if (packet->trace->format->get_link_type) {
                 return packet->trace->format->get_link_type(packet);