Changeset 1298

Timestamp:

11/06/07 14:55:03 (6 years ago)

Author:

perry

Message:

Avoid using assert() to report errors

Location:

trunk/lib

Files:

• libtrace.h.in (modified) (1 diff)
• protocols_l2.c (modified) (2 diffs)
• trace.c (modified) (8 diffs)

trunk/lib/libtrace.h.in

@@ -202 +202 @@
         TRACE_ERR_OPTION_UNAVAIL= -6,
         /** This feature is unsupported */
-        TRACE_ERR_UNSUPPORTED   = -7
+        TRACE_ERR_UNSUPPORTED   = -7,
+        /** Illegal use of the API */
+        TRACE_ERR_BAD_STATE     = -8
 };
 

trunk/lib/protocols_l2.c

@@ -32 +32 @@
                 uint32_t *remaining)
 {
-        assert(type && "You must pass a type in!");
-
         if (*type == 0x8100) {
                 libtrace_8021q_t *vlanhdr = (libtrace_8021q_t *)ethernet;
@@ -59 +57 @@
                 uint16_t *type, uint32_t *remaining)
 {
-        assert(type && "You must pass a type in!");
-
         if (*type == 0x8847) {
                 if ((((char*)ethernet)[2]&0x01)==0) {

trunk/lib/trace.c

@@ -130 +130 @@
 
 void register_format(struct libtrace_format_t *f) {
-        assert(f->next==NULL);
+        assert(f->next==NULL); /* Can't register a format twice */
         f->next=formats_list;
         formats_list=f;
@@ -463 +463 @@
                                 break;
                         default:
-                                assert(!"init_output() should return -1 for failure, or 0 for success");
+                                assert(!"Internal error: init_output() should return -1 for failure, or 0 for success");
                 }
         } else {
@@ -486 +486 @@
 {
         assert(libtrace);
-        assert(!trace_is_err(libtrace) && "Please use trace_is_err to check for errors after calling trace_create!");
+        if (trace_is_err(libtrace))
+                return -1;
         if (libtrace->format->start_input) {
                 int ret=libtrace->format->start_input(libtrace);
@@ -515 +516 @@
 {
         assert(libtrace);
-        assert(libtrace->started && "BUG: Called trace_pause without calling trace_start first");
+        if (!libtrace->started) {
+                trace_set_err(libtrace,TRACE_ERR_BAD_STATE, "You must call trace_start() before calling trace_pause()");
+                return -1;
+        }
         if (libtrace->format->pause_input)
                 libtrace->format->pause_input(libtrace);
@@ -528 +532 @@
         int ret;
         libtrace_err_t err;
-        
-        assert(!trace_is_err(libtrace) && "Please use trace_is_err to check for errors after calling trace_create!");
+
+        if (trace_is_err(libtrace)) {
+                return -1;
+        }
         
         if (libtrace->format->config_input) {
@@ -698 +704 @@
 
         assert(libtrace && "You called trace_read_packet() with a NULL libtrace parameter!\n");
-        assert(libtrace->started && "BUG: You must call libtrace_start() before trace_read_packet()\n");
+        if (trace_is_err(libtrace))
+                return -1;
+        if (!libtrace->started) {
+                trace_set_err(libtrace,TRACE_ERR_BAD_STATE,"You must call libtrace_start() before trace_read_packet()\n");
+                return -1;
+        }
+        if (packet->buf_control==TRACE_CTRL_PACKET || packet->buf_control==TRACE_CTRL_EXTERNAL) {
+                trace_set_err(libtrace,TRACE_ERR_BAD_STATE,"Packet passed to trace_read_packet() is invalid\n");
+                return -1;
+        }
         assert(packet);
-        assert((packet->buf_control==TRACE_CTRL_PACKET || packet->buf_control==TRACE_CTRL_EXTERNAL)&&
-                "BUG: You must allocate a packet using packet_create()");
       
         /* Store the trace we are reading from into the packet opaque 
@@ -758 +771 @@
         assert(packet); 
         /* Verify the packet is valid */
-        assert(libtrace->started);
+        if (!libtrace->started) {
+                trace_set_err_out(libtrace,TRACE_ERR_BAD_STATE,
+                        "Trace is not started before trace_write_packet");
+                return -1;
+        }
 
         if (libtrace->format->write_packet) {
@@ -1085 +1102 @@
         return 0;
 #else
-        assert(!"This should never be called when BPF not enabled");
+        assert(!"Internal bug: This never be called when BPF not enabled");
         trace_set_err(packet->trace,TRACE_ERR_OPTION_UNAVAIL,
                                 "Feature unavailable");