Changeset ffc8c8d for lib/format_pcap.c

Timestamp:

08/11/05 11:30:41 (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:

4d5a9a7

Parents:

a8ba977

Message:

better return codes in format_*.c, trace_perror stuff

File:

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

lib/format_pcap.c

@@ -34 +34 @@
 #include "libtrace_int.h"
 #include "format_helper.h"
-#include <inttypes.h>
+
+#ifdef HAVE_INTTYPES_H
+#  include <inttypes.h>
+#else
+#  error "Can't find inttypes.h - this needs to be fixed"
+#endif 
+
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -114 +120 @@
                 }       
         }
-        fprintf(stderr,
-                        "Unsupported scheme (%s) for format pcap\n",
-                        CONNINFO.path);
-        return 0;
+        //fprintf(stderr,       "Unsupported scheme (%s) for format pcap\n",
+        //              CONNINFO.path);
+        return 1;
         
 }
@@ -136 +141 @@
                 return 0;
         }
-
+        return 1;
 }
 
@@ -153 +158 @@
 
         packet->size = numbytes + sizeof(struct pcap_pkthdr);
-
-}
+}
+
 static int pcap_read_packet(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) {
         const u_char *pcappkt;
         int pcapbytes = 0;
 
-        while ((pcapbytes = pcap_dispatch(INPUT.pcap,
+        pcapbytes = pcap_dispatch(INPUT.pcap,
                                         1, /* number of packets */
                                         &trace_pcap_handler,
-                                        (u_char *)packet)) == 0);
-
-        if (pcapbytes < 0) {
-                return -1;
+                                        (u_char *)packet);
+
+        if (pcapbytes <= 0) {
+                return pcapbytes;
         }
         return (packet->size - sizeof(struct pcap_pkthdr));