Changeset df2dff9

Timestamp:

08/05/05 11:11:38 (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:

f99a183

Parents:

da8b03e

Message:

Fixed reading and writing erf without zlib.
Tidyed up trace_output creation.

Location:

lib

Files:

• format_erf.c (modified) (3 diffs)
• trace.c (modified) (1 diff)

lib/format_erf.c

@@ -478 +478 @@
         void *buffer2 = buffer;
         int rlen;
-        
+#if HAVE_ZLIB
         if ((numbytes=gzread(INPUT.file,
                                         buffer,
@@ -485 +485 @@
                 return -1;
         }
+#else
+        if ((numbytes = read(INPUT.file, buffer, dag_record_size)) == -1) {
+                perror("read");
+                return -1;
+        }
+#endif
         if (numbytes == 0) {
                 return 0;
@@ -592 +598 @@
 static int erf_write_packet(struct libtrace_out_t *libtrace, struct libtrace_packet_t *packet) {
         int numbytes = 0;
-
-        if ((numbytes = gzwrite(libtrace->format_data->output.file, packet->buffer, packet->size)) == 0) {
+#if HAVE_ZLIB
+        if ((numbytes = gzwrite(OUTPUT.file, packet->buffer, packet->size)) == 0) {
                 perror("gzwrite");
                 return -1;
         }
+#else
+        if ((numbytes = write(OUTPUT.file, packet->buffer, packet->size)) == 0) {
+                perror("write");
+                return -1;
+        }
+#endif
         return numbytes;
 }

lib/trace.c

@@ -361 +361 @@
         struct libtrace_out_t *libtrace = malloc(sizeof(struct libtrace_out_t));
         
-        if (init_output(&libtrace, uri) == 0)
-                return 0;
+        char *scan = calloc(sizeof(char),URI_PROTO_LINE);
+        char *uridata = 0;
+        int i;
+
+        // parse the URI to determine what sort of event we are dealing with
+
+        // want snippet before the : to get the uri base type.
+
+        if((uridata = strchr(uri,':')) == NULL) {
+                // badly formed URI - needs a :
+                return 0;
+        }
+
+        if ((*uridata - *uri) > URI_PROTO_LINE) {
+                // badly formed URI - uri type is too long
+                return 0;
+        }
+
+        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) {
+                fprintf(stderr,
+                        "libtrace has no support for this format (%s)\n",scan);
+                return 0;
+        }
+
+        // push uridata past the delimiter
+        uridata++;
+        libtrace->uridata = strdup(uridata);
+
+
+        // libtrace->format now contains the type of uri
+        // libtrace->uridata contains the appropriate data for this
+
+        if (libtrace->format->init_output) {
+                libtrace->format->init_output( libtrace);
+        } else {
+                fprintf(stderr,
+                        "No init_output function for format %s\n",scan);
+                return 0;
+        }
+
+
+        libtrace->fifo = create_fifo(1048576);
+        assert( libtrace->fifo);
 
         return libtrace;