Changeset 7c8eacf for lib/format_wag.c

Timestamp:

10/27/05 14:05:36 (17 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:

2458162

Parents:

0d82205

Message:

updated changelog
added trace_get_framing_length() to return the capture-format framing (eg, ERF or pcap headers).

File:

• lib/format_wag.c (modified) (5 diffs)

lib/format_wag.c

@@ -88 +88 @@
 #endif
 
-static struct libtrace_format_t *wag_ptr = 0;
+extern struct libtrace_format_t wag;
 
 #define CONNINFO libtrace->format_data->conn_info
@@ -334 +334 @@
 static int wag_write_packet(struct libtrace_out_t *libtrace, const struct libtrace_packet_t *packet) {
         int numbytes =0 ;
-        if (packet->trace->format != wag_ptr) {
+        if (packet->trace->format != &wag) {
                 fprintf(stderr,"Cannot convert from wag to %s format yet\n",
                                 packet->trace->format->name);
@@ -384 +384 @@
         //return (wagptr->hdr.size);
         return ntohs(wagptr->hdr.size);
+}
+
+static int wag_get_framing_length(const struct libtrace_packet_t *packet) {
+        return sizeof(struct wag_data_frame);
 }
 
@@ -433 +437 @@
         wag_get_capture_length,         /* get_capture_length */
         wag_get_wire_length,            /* get_wire_length */
+        wag_get_framing_length,         /* get_framing_length */
         NULL,                           /* set_capture_length */
         wag_get_fd,                     /* get_fd */
@@ -440 +445 @@
 
 void __attribute__((constructor)) wag_constructor() {
-        wag_ptr = &wag;
-        register_format(wag_ptr);
-}
+        register_format(&wag);
+}