Changeset 205809b for lib/format_linux.c

Timestamp:

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

File:

• lib/format_linux.c (modified) (4 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);