Changeset 735

Timestamp:

04/24/06 18:42:43 (7 years ago)

Author:

perry

Message:

Clean up the various usages of TRACE_ERR_*, add TRACE_ERR_UNSUPPORTED and
shuffle which error was returned where. Document their new usages.

Closes: #13

Also, fix the 802.1q definitions.

Location:

trunk/lib

Files:

• format_erf.c (modified) (1 diff)
• format_pcap.c (modified) (1 diff)
• format_pcapfile.c (modified) (2 diffs)
• format_rt.c (modified) (1 diff)
• libtrace.h (modified) (2 diffs)
• trace.c (modified) (3 diffs)

trunk/lib/format_erf.c

@@ -744 +744 @@
                 type=libtrace_to_erf_type(trace_get_link_type(packet));
                 if (type==(char)-1) {
-                        trace_set_err_out(libtrace,TRACE_ERR_BAD_PACKET,
+                        trace_set_err_out(libtrace,TRACE_ERR_NO_CONVERSION,
                                         "No erf type for packet");
                         return -1;

trunk/lib/format_pcap.c

@@ -175 +175 @@
         return 0;
 #else
-        trace_set_err_out(libtrace,TRACE_ERR_NO_INIT_OUT,
+        trace_set_err_out(libtrace,TRACE_ERR_UNSUPPORTED,
                         "writing not supported by this version of pcap");
         return -1;

trunk/lib/format_pcapfile.c

@@ -102 +102 @@
                 
                 if (swapl(libtrace,DATA(libtrace)->header.magic_number) != 0xa1b2c3d4) {
-                        trace_set_err(libtrace,TRACE_ERR_BAD_PACKET,"Not a pcap tracefile\n");
+                        trace_set_err(libtrace,TRACE_ERR_INIT_FAILED,"Not a pcap tracefile\n");
                         return -1; /* Not a pcap file */
                 }
@@ -108 +108 @@
                 if (swaps(libtrace,DATA(libtrace)->header.version_major)!=2
                         && swaps(libtrace,DATA(libtrace)->header.version_minor)!=4) {
-                        trace_set_err(libtrace,TRACE_ERR_BAD_PACKET,"Unknown pcap tracefile version %d.%d\n",
+                        trace_set_err(libtrace,TRACE_ERR_INIT_FAILED,"Unknown pcap tracefile version %d.%d\n",
                                         swaps(libtrace,
                                                 DATA(libtrace)->header.version_major),

trunk/lib/format_rt.c

@@ -324 +324 @@
                                 
                                 perror("recv");
-                                trace_set_err(libtrace, TRACE_ERR_RECV_FAILED,
+                                trace_set_err(libtrace, errno,
                                                 "Failed to read data into rt recv buffer");
                                 return -1;

trunk/lib/libtrace.h

@@ -167 +167 @@
 /** Enumeration of error codes */
 enum {
+        /** No Error has occured.... yet. */
         TRACE_ERR_NOERROR       = 0,
+        /** The URI passed to trace_create() is unsupported, or badly formed */
         TRACE_ERR_BAD_FORMAT    = -1,
-        TRACE_ERR_NO_INIT       = -2,
-        TRACE_ERR_NO_INIT_OUT   = -3,
-        TRACE_ERR_URI_LONG      = -4,
-        TRACE_ERR_URI_NOCOLON   = -5,
-        TRACE_ERR_INIT_FAILED   = -6,
-        TRACE_ERR_UNKNOWN_OPTION= -7,
-        TRACE_ERR_NO_CONVERSION = -8,
-        TRACE_ERR_BAD_PACKET    = -9,
-        TRACE_ERR_OPTION_UNAVAIL= -10,
-        TRACE_ERR_RECV_FAILED   = -11
+        /** The trace failed to initialise */
+        TRACE_ERR_INIT_FAILED   = -2,
+        /** Unknown config option */
+        TRACE_ERR_UNKNOWN_OPTION= -3,
+        /** Option known, but unsupported by this format */
+        TRACE_ERR_OPTION_UNAVAIL= -6,
+        /** This output uri cannot write packets of this type */
+        TRACE_ERR_NO_CONVERSION = -4,
+        /** This packet is corrupt, or unusable for the action required */ 
+        TRACE_ERR_BAD_PACKET    = -5,
+        /** This feature is unsupported */
+        TRACE_ERR_UNSUPPORTED   = -7
 };
 
@@ -342 +346 @@
 typedef struct libtrace_8021q 
 {
-  uint8_t  ether_dhost[6];      /**< destination eth addr */
-  uint8_t  ether_shost[6];      /**< source ether addr    */
-  uint16_t ether_type;          /**< packet type ID field , 0x8100 for VLAN */
   unsigned int vlan_pri:3;       /**< vlan user priority */
   unsigned int vlan_cfi:1;       /**< vlan format indicator, 

trunk/lib/trace.c

@@ -343 +343 @@
                 }
         } else {
-                trace_set_err(libtrace,TRACE_ERR_NO_INIT,
+                trace_set_err(libtrace,TRACE_ERR_UNSUPPORTED,
                                 "Format does not support input (%s)",scan);
                 return libtrace;
@@ -471 +471 @@
                 }
         } else {
-                trace_set_err_out(libtrace,TRACE_ERR_NO_INIT_OUT,
+                trace_set_err_out(libtrace,TRACE_ERR_UNSUPPORTED,
                                 "Format does not support writing (%s)",scan);
                 return libtrace;
@@ -682 +682 @@
                 } while(1);
         }
-        trace_set_err(libtrace,TRACE_ERR_BAD_FORMAT,"This format does not support reading packets\n");
+        trace_set_err(libtrace,TRACE_ERR_UNSUPPORTED,"This format does not support reading packets\n");
         packet->size=-1;
         return -1;