Changeset 205809b for lib

Timestamp:

02/01/07 14:06:43 (15 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:

d242ea8

Parents:

d5a27e8

Message:

Error handling in trace_config is now much more robust - it doesn't overwrite error messages set by the format module and it will clear the format module's error if trace_config can successfully deal with the option (such as filtering).
Added some trace_set_errs to linuxnative_start as it would give absolutely no indication why things failed.

Location:

lib

Files:

• format_linux.c (modified) (4 diffs)
• trace.c (modified) (2 diffs)

lib/format_linux.c

@@ -100 +100 @@
                                 socket(PF_PACKET, SOCK_RAW, htons(ETH_P_ALL));
         if (FORMAT(libtrace->format_data)->fd==-1) {
+                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Could not create raw socket");
                 free(libtrace->format_data);
                 return -1;
@@ -109 +110 @@
                 if (addr.sll_ifindex == 0) {
                         close(FORMAT(libtrace->format_data)->fd);
+                        trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Failed to find interface %s", libtrace->uridata);
                         free(libtrace->format_data);
                         return -1;
@@ -120 +122 @@
                                 (socklen_t)sizeof(addr))==-1) {
                 free(libtrace->format_data);
+                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED, "Failed to bind to interface %s", libtrace->uridata);
                 return -1;
         }
@@ -217 +220 @@
                  */
         }
+        
         trace_set_err(libtrace,TRACE_ERR_UNKNOWN_OPTION,
                         "Unknown option %i", option);

lib/trace.c

@@ -529 +529 @@
 {
         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 (libtrace->format->config_input) {
                 ret=libtrace->format->config_input(libtrace,option,value);
@@ -536 +540 @@
         switch(option) {
                 case TRACE_OPTION_SNAPLEN:
+                        /* Clear the error if there was one */
+                        if (trace_is_err(libtrace)) {
+                                err = trace_get_err(libtrace);
+                        }
                         libtrace->snaplen=*(int*)value;
                         return 0;
                 case TRACE_OPTION_FILTER:
+                        /* Clear the error if there was one */
+                        if (trace_is_err(libtrace)) {
+                                err = trace_get_err(libtrace);
+                        }
                         libtrace->filter=(libtrace_filter_t *)value;
                         return 0;
                 case TRACE_OPTION_PROMISC:
-                        trace_set_err(libtrace,TRACE_ERR_OPTION_UNAVAIL,
-                                "Promisc mode is not supported by this format module");
+                        if (!trace_is_err(libtrace)) {
+                                trace_set_err(libtrace,TRACE_ERR_OPTION_UNAVAIL,
+                                                "Promisc mode is not supported by this format module");
+                        }
                         return -1;
                 case TRACE_META_FREQ:
-                        trace_set_err(libtrace, TRACE_ERR_OPTION_UNAVAIL,
-                                "This format does not support meta-data gathering");
+                        if (!trace_is_err(libtrace)) {
+                                trace_set_err(libtrace, 
+                                                TRACE_ERR_OPTION_UNAVAIL,
+                                                "This format does not support meta-data gathering");
+                        }
                         return -1;
         }
-        trace_set_err(libtrace,TRACE_ERR_UNKNOWN_OPTION,
-                "Unknown option %i", option);
+        if (!trace_is_err(libtrace)) {
+                trace_set_err(libtrace,TRACE_ERR_UNKNOWN_OPTION,
+                        "Unknown option %i", option);
+        }
         return -1;
 }