Changeset 72bfe20 for lib/format_pcap.c

Timestamp:

08/08/05 16:33:16 (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:

c3274c6

Parents:

8184acc

Message:

trace_event fixed

File:

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

lib/format_pcap.c

@@ -33 +33 @@
 #include "libtrace.h"
 #include "libtrace_int.h"
+#include "format_helper.h"
 #include <inttypes.h>
 #include <sys/types.h>
@@ -56 +57 @@
 
 #if HAVE_PCAP
+
+#define CONNINFO libtrace->format_data->conn_info
+#define INPUT libtrace->format_data->input
 
 struct libtrace_format_data_t {
@@ -76 +80 @@
         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,
+        CONNINFO.path = libtrace->uridata;
+
+        libtrace->sourcetype = TRACE;
+        if (!strncmp(CONNINFO.path,"-",1)) {
+                if ((INPUT.pcap = 
+                        pcap_open_offline(CONNINFO.path,
                                                 errbuf)) == NULL) {
                         fprintf(stderr,"%s\n",errbuf);
@@ -85 +91 @@
                 }               
         } else {
-                if (stat(libtrace->format_data->conn_info.path,&buf) == -1) {
+                if (stat(CONNINFO.path,&buf) == -1) {
                         perror("stat");
                         return 0;
                 }
                 if (S_ISCHR(buf.st_mode)) {
-                        if ((libtrace->format_data->input.pcap = 
-                                pcap_open_live(libtrace->format_data->conn_info.path,
+                        if ((INPUT.pcap = 
+                                pcap_open_live(CONNINFO.path,
                                         4096,
                                         1,
@@ -100 +106 @@
                         }
                 } else { 
-                        if ((libtrace->format_data->input.pcap = 
-                                pcap_open_offline(libtrace->format_data->conn_info.path,
+                        if ((INPUT.pcap = 
+                                pcap_open_offline(CONNINFO.path,
                                         errbuf)) == NULL) {
                                 fprintf(stderr,"%s\n",errbuf);
@@ -110 +116 @@
         fprintf(stderr,
                         "Unsupported scheme (%s) for format pcap\n",
-                        libtrace->format_data->conn_info.path);
+                        CONNINFO.path);
         return 0;
         
@@ -117 +123 @@
 static int pcapint_init_input(struct libtrace_t *libtrace) {
         char errbuf[PCAP_ERRBUF_SIZE];
-        if ((libtrace->format_data->input.pcap = 
-                        pcap_open_live(libtrace->format_data->conn_info.path,
+        libtrace->format_data = (struct libtrace_format_data_t *) 
+                malloc(sizeof(struct libtrace_format_data_t));
+        CONNINFO.path = libtrace->uridata;
+        libtrace->sourcetype = INTERFACE;
+        if ((INPUT.pcap = 
+                        pcap_open_live(CONNINFO.path,
                         4096,
                         1,
@@ -149 +159 @@
         int pcapbytes = 0;
 
-        while ((pcapbytes = pcap_dispatch(libtrace->format_data->input.pcap,
+        while ((pcapbytes = pcap_dispatch(INPUT.pcap,
                                         1, /* number of packets */
                                         &trace_pcap_handler,
@@ -274 +284 @@
 }
 
+static int pcap_get_fd(struct libtrace_packet_t *packet) {
+        return pcap_fileno(packet->trace->format_data->input.pcap);
+}
+
 static void pcap_help() {
         printf("pcap format module: $Revision$\n");
@@ -307 +321 @@
         pcap_fin_input,                 /* fin_input */
         NULL,                           /* fin_output */
-        NULL,                           /* read */
         pcap_read_packet,               /* read_packet */
         NULL,                           /* write_packet */
@@ -320 +333 @@
         pcap_get_wire_length,           /* get_wire_length */
         pcap_set_capture_length,        /* set_capture_length */
+        NULL,                           /* get_fd */
+        trace_event_trace,              /* trace_event */
         pcap_help                       /* help */
 };
@@ -331 +346 @@
         pcap_fin_input,                 /* fin_input */
         NULL,                           /* fin_output */
-        NULL,                           /* read */
         pcap_read_packet,               /* read_packet */
         NULL,                           /* write_packet */
@@ -344 +358 @@
         pcap_get_wire_length,           /* get_wire_length */
         pcap_set_capture_length,        /* set_capture_length */
+        pcap_get_fd,                    /* get_fd */
+        trace_event_device,             /* trace_event */
         pcapint_help                    /* help */
 };