Changeset f875681 for lib

Timestamp:

06/23/06 11:59:38 (16 years ago)

Author:

Perry Lorier <perry@…>

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:

c5ebbaa

Parents:

430077b

Message:

Deal better with errors in pcap:

File:

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

lib/format_pcap.c

@@ -249 +249 @@
 static int pcap_fin_output(libtrace_out_t *libtrace) 
 {
-        pcap_dump_flush(OUTPUT.trace.dump);
-        pcap_dump_close(OUTPUT.trace.dump);
+        if (OUTPUT.trace.dump) {
+                pcap_dump_flush(OUTPUT.trace.dump);
+                pcap_dump_close(OUTPUT.trace.dump);
+        }
         pcap_close(OUTPUT.trace.pcap);
         free(libtrace->format_data);
@@ -319 +321 @@
                         libtrace_to_pcap_dlt(trace_get_link_type(packet)),
                         65536);
+                if (!OUTPUT.trace.pcap) {
+                        trace_set_err_out(libtrace,TRACE_ERR_INIT_FAILED,"Failed to open dead trace: %s\n",
+                                        pcap_geterr(OUTPUT.trace.pcap));
+                }
                 OUTPUT.trace.dump = pcap_dump_open(OUTPUT.trace.pcap,
                                 libtrace->uridata);
-                fflush((FILE *)OUTPUT.trace.dump);
+                if (!OUTPUT.trace.dump) {
+                        char *errmsg = pcap_geterr(OUTPUT.trace.pcap);
+                        trace_set_err_out(libtrace,TRACE_ERR_INIT_FAILED,"Failed to open output file: %s\n",
+                                        errmsg ? errmsg : "Unknown error");
+                        return -1;
+                }
         }
         if (packet->trace->format == &pcap ||