Changeset 1242 for trunk/lib/format_legacy.c

Timestamp:

06/28/07 15:43:40 (6 years ago)

Author:

spa1

Message:

• Added format for Auckland VII-style ATM header captures
• Fixed bug in format_legacy where a non-64 byte record would cause an assert fail - it will now keep trying to read until it gets a 64 byte record or reaches EOF.
• trace_copy_packet was not initializing the cached values sensibly which was wreaking havoc - this is now fixed.

File:

• trunk/lib/format_legacy.c (modified) (1 diff)

trunk/lib/format_legacy.c

@@ -132 +132 @@
                         assert(0);
         }
-        
-        if ((numbytes=libtrace_io_read(INPUT.file,
-                                        buffer,
-                                        (size_t)64)) != 64) {
-                if (numbytes!=0) {
-                        trace_set_err(libtrace,errno,"read(%s)",libtrace->uridata);
+
+        /* This is going to block until we either get an entire record
+         * or we reach the end of the file */
+        while (1) {
+        
+                if ((numbytes=libtrace_io_read(INPUT.file,
+                                                buffer,
+                                                (size_t)64)) != 64) {
+                        if (numbytes < 0) {
+                                trace_set_err(libtrace,errno,"read(%s)",libtrace->uridata);
+                        } else if (numbytes > 0) {
+                                
+                                continue;
+                        }
+                        return numbytes;
                 }
-                return numbytes;
+                break;
         }