Changeset 886

Timestamp:

06/23/06 17:15:57 (7 years ago)

Author:

spa1

Message:

Added some better error checking to the connection stage of format_rt
Fixed outdated documentation in libtrace.h
Removed warning about demote_packet in format_erf

Location:

trunk/lib

Files:

• format_erf.c (modified) (1 diff)
• format_rt.c (modified) (1 diff)
• libtrace.h.in (modified) (1 diff)

trunk/lib/format_erf.c

@@ -941 +941 @@
                 do {
                         type=libtrace_to_erf_type(trace_get_link_type(packet));
-                } while(type==(char)-1 && demote_packet(packet));
+                } while(type==(char)-1 && demote_packet((libtrace_packet_t *)packet));
                 /* We just don't support this link type sorry */
                 if (type==(char)-1) {

trunk/lib/format_rt.c

@@ -102 +102 @@
         
         if ((he=gethostbyname(RT_INFO->hostname)) == NULL) {
-                perror("gethostbyname");
-                return -1;
+                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
+                                "Failed to convert hostname %s to address",
+                                RT_INFO->hostname);
+                return -1;
         }
         if ((RT_INFO->input_fd = socket(AF_INET, SOCK_STREAM, 0)) == -1) {
-                perror("socket");
-                return -1;
+                trace_set_err(libtrace, TRACE_ERR_INIT_FAILED,
+                                "Could not create socket");
+                return -1;
         }
 

trunk/lib/libtrace.h.in

@@ -1143 +1143 @@
  * @return opaque pointer pointer to a libtrace_filter_t object
  * @note The filter is not actually compiled at this point, so no correctness
- * tests are performed here. trace_bpf_setfilter will always return ok, but
+ * tests are performed here. trace_create_filter will always return ok, but
  * if the filter is poorly constructed an error will be generated when the 
  * filter is actually used