Changeset 91ea76c for lib

Timestamp:

05/28/12 14:07:07 (9 years ago)

Author:

Shane Alcock <salcock@…>

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:

16c598d

Parents:

b3edbe9

Message:

• Detect if a user is attempting to read a compressed format that their libtrace build does not support and provide an appropriate error. Previously, we'd just try to read the trace with a stdout reader, resulting in some very confusing results.

Location:

lib

Files:

• format_helper.c (modified) (1 diff)
• libtrace.h.in (modified) (2 diffs)

lib/format_helper.c

@@ -266 +266 @@
         io_t *io=wandio_create(trace->uridata);
         if (!io) {
-                trace_set_err(trace,errno,"Unable to open %s",trace->uridata);
+                if (errno != 0) {
+                        trace_set_err(trace,errno,"Unable to open %s",trace->uridata);
+                } else {
+                        trace_set_err(trace,TRACE_ERR_UNSUPPORTED_COMPRESS,"Unsupported compression error: %s", trace->uridata);
+                }
         }
         return io;

lib/libtrace.h.in

@@ -226 +226 @@
         TRACE_ERR_BAD_FILTER    = -9,
         /** RT communication breakdown */
-        TRACE_ERR_RT_FAILURE    = -10
+        TRACE_ERR_RT_FAILURE    = -10,
+        /** Compression format unsupported */
+        TRACE_ERR_UNSUPPORTED_COMPRESS  = -11
 };
 
@@ -744 +746 @@
         LT_BITFIELD32      to_ds:1;     /**< Packet to Distribution Service */
 #endif
+        
         uint16_t     duration;  /**< Duration value for NAV calculation */
         uint8_t      mac1[6];   /**< MAC Address 1 */