Changeset 85a0d42 for lib

Timestamp:

03/17/06 13:23:00 (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:

72cc9cc

Parents:

752709f

Message:

Fix up output, better reporting of output errors

Location:

lib

Files:

• format_erf.c (modified) (3 diffs)
• format_pcap.c (modified) (2 diffs)

lib/format_erf.c

@@ -688 +688 @@
         int numbytes = 0;
         assert(size<=65536);
-        /* FIXME: Shouldn't this return != dag_record_size+pad on error? */
-        if ((numbytes = LIBTRACE_WRITE(OUTPUT.file, erfptr, dag_record_size + pad)) == 0) {
+
+        if ((numbytes = LIBTRACE_WRITE(OUTPUT.file, erfptr, dag_record_size + pad)) != dag_record_size+pad) {
                 trace_set_err_out(libtrace,errno,
                                 "write(%s)",libtrace->uridata);
@@ -695 +695 @@
         }
 
-        if ((numbytes=LIBTRACE_WRITE(OUTPUT.file, buffer, size)) == 0) {
+        if ((numbytes=LIBTRACE_WRITE(OUTPUT.file, buffer, size)) != size) {
                 trace_set_err_out(libtrace,errno,
                                 "write(%s)",libtrace->uridata);
@@ -733 +733 @@
         } 
         
-        if (libtrace->format == &erf  
+        if (packet->trace->format == &erf  
 #if HAVE_DAG
-                        || libtrace->format == &dag 
+                        || packet->trace->format == &dag 
 #endif
                         ) {
                 numbytes = erf_dump_packet(libtrace,
-                                (dag_record_t *)packet->buffer,
+                                (dag_record_t *)packet->header,
                                 pad,
                                 payload,

lib/format_pcap.c

@@ -298 +298 @@
                 fflush((FILE *)OUTPUT.trace.dump);
         }
-        if (libtrace->format == &pcap || 
-                        libtrace->format == &pcapint) {
-                
+        if (packet->trace->format == &pcap || 
+                        packet->trace->format == &pcapint) {
                 pcap_dump((u_char*)OUTPUT.trace.dump,(struct pcap_pkthdr *)packet->header,packet->payload);
         } else {
@@ -311 +310 @@
                 pcap_pkt_hdr.caplen = trace_get_capture_length(packet);
                 pcap_pkt_hdr.len = trace_get_wire_length(packet);
+
+                assert(pcap_pkt_hdr.caplen<65536);
+                assert(pcap_pkt_hdr.len<65536);
 
                 pcap_dump((u_char*)OUTPUT.trace.dump, &pcap_pkt_hdr, packet->payload);