Changeset b535184 for examples/pcap2erf/pcap2erf.c

Timestamp:

08/05/04 16:14:07 (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:

2137b49

Parents:

9729a8d

Message:

updated examples to use 1.1.0 api

File:

• examples/pcap2erf/pcap2erf.c (modified) (7 diffs)

examples/pcap2erf/pcap2erf.c

@@ -46 +46 @@
 #include <linux/if_ether.h>
 
-extern "C" {
+//extern "C" {
 #include "dagformat.h"
 #include "libtrace.h"
-}
+//}
 
 struct libtrace_t *trace;
@@ -66 +66 @@
 int main(int argc, char *argv[]) {
 
-    char *hostname;
+    char *uri;
     int psize = 0;
-    int status = 0;
     char *filename;
     FILE* input;
     
     struct pcap_pkthdr *header;
+    struct libtrace_packet_t packet;
     unsigned long seconds, subseconds;
     unsigned short rlen, lctr, wlen, offset, pad;
@@ -80 +80 @@
     uint32_t netmask = 0;
     int data_size;
-    struct tcphdr *tcpptr = 0;
+    struct libtrace_tcp *tcpptr = 0;
     int octets[4];
     int hlen;
-    ip *ipptr;
+    struct libtrace_ip *ipptr;
 
     
     // 2 parameters only, both neccessary
     if (argc == 3) {
-        hostname = strdup(argv[1]);
+        uri = strdup(argv[1]);
         filename = strdup(argv[2]);
     }
@@ -159 +159 @@
     //----------------------------------------------------------------------
 
-    // create an trace to hostname, on the default port
-    trace = create_trace(hostname);
+    // create an trace to the given uri
+    trace = trace_create(uri);
 
     for (;;) {
-        if ((psize = libtrace_read_packet(trace, buffer,SCANSIZE, &status)) 
+        if ((psize = trace_read_packet(trace, &packet)) 
                 == -1) {
             // terminate
@@ -169 +169 @@
         }
         // buffer returned is pcap-->ethernet-->upperlayers
-        header = (struct pcap_pkthdr*) buffer;
+        header = (struct pcap_pkthdr*)packet.buffer;
 
         // if this isnt an ip packet, ignore it
-        if(! ((buffer + sizeof(struct pcap_pkthdr))[12] == 8 &&
-            (buffer + sizeof(struct pcap_pkthdr))[13] == 0))
+        if(! ((packet.buffer + sizeof(struct pcap_pkthdr))[12] == 8 &&
+            (packet.buffer + sizeof(struct pcap_pkthdr))[13] == 0))
             continue;
         
-        ipptr = (ip *)(buffer + (sizeof(uint8_t)*30));// wtf is 30
+
+        ipptr = trace_get_ip(&packet);
         hlen = ipptr->ip_hl*4;
 
@@ -183 +184 @@
         {
             case 1: data_size = 14 + hlen; break;
-            case 6: tcpptr = (struct tcphdr *) ((uint8_t *)ipptr + hlen);
+            case 6: tcpptr = (struct libtrace_tcp *) ((uint8_t *)ipptr + hlen);
                     data_size = 14 + hlen + (tcpptr->doff*4); break;
             case 17: data_size = 14 + hlen + 8; break;
@@ -244 +245 @@
 
         // write as much of the packet as we need (just the headers)
-        fwrite(buffer + sizeof(pcap_pkthdr), 1, data_size, stdout);
-    }
-
-    destroy_trace(trace);
+        fwrite(packet.buffer + sizeof(pcap_pkthdr), 1, data_size, stdout);
+    }
+
+    trace_destroy(trace);
     return 0;
 }