Changeset ffc8c8d for lib/trace.c

Timestamp:

08/11/05 11:30:41 (16 years ago)

Author:

Daniel Lawson <dlawson@…>

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:

4d5a9a7

Parents:

a8ba977

Message:

better return codes in format_*.c, trace_perror stuff

File:

• lib/trace.c (modified) (6 diffs)

lib/trace.c

@@ -113 +113 @@
 #endif
 
-//#if HAVE_PCAP_H
-//#  include <pcap.h>
-//#  ifdef HAVE_PCAP_INT_H
-//#    include <pcap-int.h>
-//#  endif
-//#endif 
-
-//#ifdef HAVE_ZLIB_H
-//#  include <zlib.h>
-//#endif
-
-
-//#include "wag.h"
-
-//#ifdef HAVE_DAG_API
-//#  include "dagnew.h"
-//#  include "dagapi.h"
-//#else
-//#  include "dagformat.h"
-//#endif
-
 #include "libtrace_int.h"
 #include "format_helper.h"
-//#include "format/format_list.h"
 #include <err.h>
 
 #define MAXOPTS 1024
 
-//typedef enum {SOCKET, TRACE, STDIN, DEVICE, INTERFACE, RT } source_t;
-
-//typedef enum {ERF, PCAP, PCAPINT, DAG, RTCLIENT, WAG, WAGINT } format_e_t;
-
-//typedef enum {RTSERVER, GZERF } output_t;
 #if HAVE_BPF
 /** A type encapsulating a bpf filter
@@ -158 +131 @@
 #endif
 
-// Error codes
-enum {E_NOERROR, E_BAD_FORMAT, E_NO_INIT, E_NO_INIT_OUT, E_URI_LONG, E_URI_NOCOLON };
-
-static struct {
-        int err_num;    // error code
-        char *problem;  // the format, uri etc that caused the error for reporting purposes
-} trace_err;
+
 
 struct libtrace_format_t **format_list = 0;
@@ -216 +183 @@
                         fprintf(stderr, "%s: A uri must contain at least one colon e.g. format:destination\n", caller);
                         break;
+                case E_INIT_FAILED:
+                        fprintf(stderr, "%s: libtrace failed to initialise (%s)\n",caller,trace_err.problem);
+                        
                 default:
                         fprintf(stderr, "Unkown errcode %d\n",trace_err.err_num);
@@ -310 +280 @@
         
         if (libtrace->format->init_input) {
-                libtrace->format->init_input( libtrace);
+                if (!libtrace->format->init_input( libtrace)) {
+                        trace_err.err_num = E_INIT_FAILED;
+                        trace_err.problem = scan;
+                        return 0;
+                }
         } else {
                 trace_err.err_num = E_NO_INIT;
@@ -382 +356 @@
 
         if (libtrace->format->init_output) {
-                libtrace->format->init_output( libtrace);
+                if(!libtrace->format->init_output( libtrace)) {
+                        return 0;
+                }
         } else {
                 trace_err.err_num = E_NO_INIT_OUT;
@@ -460 +436 @@
 
         if (!libtrace) {
-                fprintf(stderr,"Oi! You called trace_read_packet() with a NULL libtrace parameter!\n");
+                fprintf(stderr,"You called trace_read_packet() with a NULL libtrace parameter!\n");
         }
         assert(libtrace);