Changeset 9e2a109 for lib/format_pcap.c

Timestamp:

08/04/05 15:37:08 (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:

ef55d05

Parents:

fe43699

Message:

moved format.h to libtrace_int.h

pulled out all the format-specific libtrace_t stuff into an opaque pointer which is defined inside each format_*.o file, for both input and output

This seems to work, it compiles at least, and wag and erf both work

rtclient input is currently broken, I suspect it's not stepping over the status properly

File:

• lib/format_pcap.c (modified) (10 diffs)

lib/format_pcap.c

@@ -32 +32 @@
 #include "config.h"
 #include "libtrace.h"
-#include "format.h"
+#include "libtrace_int.h"
 #include <inttypes.h>
 #include <sys/types.h>
@@ -57 +57 @@
 #if HAVE_PCAP
 
+struct libtrace_format_data_t {
+        union {
+                char *path;             /**< information for local sockets */
+                char *interface;        /**< intormation for reading of network
+                                             interfaces */
+        } conn_info;
+        /** Information about the current state of the input device */
+        union {
+                int fd;
+                FILE *file;
+                pcap_t *pcap;
+        } input;
+};
+
 static int pcap_init_input(struct libtrace_t *libtrace) {
         char errbuf[PCAP_ERRBUF_SIZE];
         struct stat buf;
-        if (!strncmp(libtrace->conn_info.path,"-",1)) {
-                if ((libtrace->input.pcap = 
-                        pcap_open_offline(libtrace->conn_info.path,
+        libtrace->format_data = (struct libtrace_format_data_t *) 
+                malloc(sizeof(struct libtrace_format_data_t));
+        libtrace->format_data->conn_info.path = libtrace->uridata;
+        if (!strncmp(libtrace->format_data->conn_info.path,"-",1)) {
+                if ((libtrace->format_data->input.pcap = 
+                        pcap_open_offline(libtrace->format_data->conn_info.path,
                                                 errbuf)) == NULL) {
                         fprintf(stderr,"%s\n",errbuf);
@@ -68 +85 @@
                 }               
         } else {
-                if (stat(libtrace->conn_info.path,&buf) == -1) {
+                if (stat(libtrace->format_data->conn_info.path,&buf) == -1) {
                         perror("stat");
                         return 0;
                 }
                 if (S_ISCHR(buf.st_mode)) {
-                        if ((libtrace->input.pcap = 
-                                pcap_open_live(libtrace->conn_info.path,
+                        if ((libtrace->format_data->input.pcap = 
+                                pcap_open_live(libtrace->format_data->conn_info.path,
                                         4096,
                                         1,
@@ -83 +100 @@
                         }
                 } else { 
-                        if ((libtrace->input.pcap = 
-                                pcap_open_offline(libtrace->conn_info.path,
+                        if ((libtrace->format_data->input.pcap = 
+                                pcap_open_offline(libtrace->format_data->conn_info.path,
                                         errbuf)) == NULL) {
                                 fprintf(stderr,"%s\n",errbuf);
@@ -93 +110 @@
         fprintf(stderr,
                         "Unsupported scheme (%s) for format pcap\n",
-                        libtrace->conn_info.path);
+                        libtrace->format_data->conn_info.path);
         return 0;
         
@@ -100 +117 @@
 static int pcapint_init_input(struct libtrace_t *libtrace) {
         char errbuf[PCAP_ERRBUF_SIZE];
-        if ((libtrace->input.pcap = 
-                        pcap_open_live(libtrace->conn_info.path,
+        if ((libtrace->format_data->input.pcap = 
+                        pcap_open_live(libtrace->format_data->conn_info.path,
                         4096,
                         1,
@@ -132 +149 @@
         int pcapbytes = 0;
 
-        while ((pcapbytes = pcap_dispatch(libtrace->input.pcap,
+        while ((pcapbytes = pcap_dispatch(libtrace->format_data->input.pcap,
                                         1, /* number of packets */
                                         &trace_pcap_handler,
@@ -151 +168 @@
         int linktype = 0;
         pcapptr = (struct pcap_pkthdr *)packet->buffer;
-        linktype = pcap_datalink(packet->trace->input.pcap);
+        linktype = pcap_datalink(packet->trace->format_data->input.pcap);
         switch(linktype) {
                 case DLT_NULL:
@@ -280 +297 @@
         printf("\n");
 }
-static struct format_t pcap = {
+
+
+static struct libtrace_format_t pcap = {
         "pcap",
         "$Id$",
@@ -304 +323 @@
 };
 
-static struct format_t pcapint = {
+static struct libtrace_format_t pcapint = {
         "pcapint",
         "$Id$",