Changeset 084d95a

Timestamp:

09/05/05 14:44:41 (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:

de8c420b

Parents:

03cbfec

Message:

Fixed another reference to sizeof(dag_record_t) and added support for dummy traces

trace_create_dead and trace_destroy_dead

Location:

lib

Files:

• format_erf.c (modified) (1 diff)
• libtrace.h (modified) (2 diffs)
• trace.c (modified) (2 diffs)

lib/format_erf.c

@@ -654 +654 @@
                                 payload,
                                 packet->size - 
-                                        sizeof(dag_record_t)); 
+                                        (dag_record_size + 2)); 
         } else {
                 // convert format - build up a new erf header

lib/libtrace.h

@@ -236 +236 @@
 struct libtrace_t *trace_create(char *uri);
 
+/** Creates a "dummy" trace file that has only the format type set.
+ *
+ * @returns opaque pointer to a (sparsely initialised) libtrace_t
+ *
+ * IMPORTANT: Do not attempt to call trace_read_packet or other such functions with
+ * the dummy trace. Its intended purpose is to act as a packet->trace for libtrace_packet_t's
+ * that are not associated with a libtrace_t structure.
+ */
+struct libtrace_t *trace_create_dead(char *uri);
+
 /** Creates a trace output file from a URI. 
  *
@@ -263 +273 @@
  */
 void trace_destroy(struct libtrace_t *trace);
+
+void trace_destroy_dead(struct libtrace_t *trace);
 
 /** Close a trace output file, freeing up any resources it may have been using

lib/trace.c

@@ -308 +308 @@
 }
 
+struct libtrace_t * trace_create_dead (char *uri) {
+        struct libtrace_t *libtrace = malloc(sizeof(struct libtrace_t));
+        char *scan = calloc(sizeof(char),URI_PROTO_LINE);
+        char *uridata;
+        int i;
+        
+        trace_err.err_num = E_NOERROR;
+
+        if((uridata = strchr(uri,':')) == NULL) {
+                strncpy(scan, uri, strlen(uri));
+        } else {
+                strncpy(scan,uri, (uridata - uri));
+        }
+        
+        libtrace->format = 0;   
+        
+        for (i = 0; i < nformats; i++) {
+                if (strlen(scan) == strlen(format_list[i]->name) &&
+                                !strncasecmp(scan,
+                                        format_list[i]->name,
+                                        strlen(scan))) {
+                                libtrace->format=format_list[i];
+                                break;
+                                }
+        }
+        if (libtrace->format == 0) {
+                trace_err.err_num = E_BAD_FORMAT;
+                trace_err.problem = scan;
+                return 0;
+        }
+
+        return libtrace;
+
+}
+        
 /** Creates a libtrace_out_t structure and the socket / file through which output will be directed.
  *
@@ -421 +456 @@
 }
 
+
+void trace_destroy_dead(struct libtrace_t *libtrace) {
+        assert(libtrace);
+        free(libtrace);
+}
 /** Close an output trace file, freeing up any resources it may have been using
  *