Changeset 1401 for trunk/lib/format_pcapfile.c

Timestamp:

01/05/09 11:29:11 (4 years ago)

Author:

perry

Message:

Try to autoguess the tracetype if the format uri specify is not present

File:

• trunk/lib/format_pcapfile.c (modified) (11 diffs)

trunk/lib/format_pcapfile.c

@@ -42 +42 @@
 #include <errno.h>
 #include <fcntl.h>
+#include <stdbool.h>
 
 #define DATA(x) ((struct pcapfile_format_data_t*)((x)->format_data))
@@ -58 +59 @@
 
 struct pcapfile_format_data_t {
-        io_t *file;
         struct {
                 int real_time;
         } options;
+        bool started;
         pcapfile_header_t header;
 };
@@ -72 +73 @@
 };
 
+static int pcapfile_probe_magic(io_t *io)
+{
+        pcapfile_header_t header;
+        int len;
+        len = wandio_peek(io, &header, sizeof(header));
+        /* Is this long enough? */
+        if (len < (int)sizeof(header)) {
+                return 0;
+        }
+        /* Pcap magic? */
+        if (header.magic_number == 0xa1b2c3d4 || header.magic_number == 0xd4c3b2a1) {
+                return 1;
+        }
+        /* Nope, not pcap */
+        return 0;
+}
+
 static int pcapfile_init_input(libtrace_t *libtrace) {
         libtrace->format_data = malloc(sizeof(struct pcapfile_format_data_t));
@@ -80 +98 @@
         }
 
-        DATA(libtrace)->file=NULL;
         IN_OPTIONS.real_time = 0;
+        DATA(libtrace)->started = false;
         return 0;
 }
@@ -127 +145 @@
         int err;
 
-        if (!DATA(libtrace)->file) {
-                DATA(libtrace)->file=trace_open_file(libtrace);
-
-                if (!DATA(libtrace)->file)
+        if (!libtrace->io) {
+                libtrace->io=trace_open_file(libtrace);
+                DATA(libtrace)->started=false;
+        }
+
+        if (!DATA(libtrace)->started) {
+
+                if (!libtrace->io)
                         return -1;
 
-                err=wandio_read(DATA(libtrace)->file,
+                err=wandio_read(libtrace->io,
                                 &DATA(libtrace)->header,
                                 sizeof(DATA(libtrace)->header));
@@ -189 +211 @@
 static int pcapfile_fin_input(libtrace_t *libtrace) 
 {
-        if (DATA(libtrace)->file)
-                wandio_destroy(DATA(libtrace)->file);
+        if (libtrace->io)
+                wandio_destroy(libtrace->io);
         free(libtrace->format_data);
         return 0; /* success */
@@ -197 +219 @@
 static int pcapfile_fin_output(libtrace_out_t *libtrace)
 {
-        if (DATA(libtrace)->file)
+        if (DATAOUT(libtrace)->file)
                 wandio_wdestroy(DATAOUT(libtrace)->file);
         free(libtrace->format_data);
@@ -269 +291 @@
         flags |= TRACE_PREP_OWN_BUFFER;
         
-        err=wandio_read(DATA(libtrace)->file,
+        err=wandio_read(libtrace->io,
                         packet->buffer,
                         sizeof(libtrace_pcapfile_pkt_hdr_t));
@@ -284 +306 @@
         }
 
-        err=wandio_read(DATA(libtrace)->file,
+        err=wandio_read(libtrace->io,
                         (char*)packet->buffer+sizeof(libtrace_pcapfile_pkt_hdr_t),
                         (size_t)swapl(libtrace,((libtrace_pcapfile_pkt_hdr_t*)packet->buffer)->caplen)
@@ -322 +344 @@
         /* Silently discard RT metadata packets and packets with an
          * unknown linktype. */
-        if (linktype == TRACE_TYPE_METADATA || linktype == -1) {
+        if (linktype == TRACE_TYPE_METADATA || linktype == ~0U) {
                 return 0;
         }
@@ -570 +592 @@
         "$Id$",
         TRACE_FORMAT_PCAPFILE,
+        NULL,                           /* probe filename */
+        pcapfile_probe_magic,           /* probe magic */
         pcapfile_init_input,            /* init_input */
         pcapfile_config_input,          /* config_input */