Changeset 1f2220f

Timestamp:

08/02/05 16:47:43 (15 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:

91ebc50

Parents:

bbc3497

Message:

wag works. can read from a trace file.
wag doesn't do things in network byte order though, so be careful

File:

• lib/format_wag.c (modified) (3 diffs)

lib/format_wag.c

@@ -124 +124 @@
 }
 
+static int wag_read(struct libtrace_t *libtrace, void *buffer, size_t len) {
+        int numbytes;
+        static short lctr = 0;
+        int rlen;
+        assert(libtrace);
+        assert(len >= 0);
+
+        if (buffer == 0)
+                buffer = malloc(len);
+
+        while(1) {
+                switch(libtrace->sourcetype) {
+                        case DEVICE:
+                                if ((numbytes=read(libtrace->input.fd, 
+                                                                buffer, 
+                                                                len)) == -1) {
+                                        perror("read");
+                                        return -1;
+                                }
+                                break;
+                        default:
+#if HAVE_ZLIB
+                                if ((numbytes=gzread(libtrace->input.file,
+                                                                buffer,
+                                                                len)) == -1) {
+                                        perror("gzread");
+                                        return -1;
+                                }
+#else
+                                if ((numbytes=fread(buffer,len,1,
+                                        libtrace->input.file)) == 0 ) {
+                                        if(feof(libtrace->input.file)) {
+                                                return 0;
+                                        }
+                                        if(ferror(libtrace->input.file)) {
+                                                perror("fread");
+                                                return -1;
+                                        }
+                                        return 0;
+                                }
+#endif
+                }
+                break;
+        }
+        return numbytes;
+
+}
+
+
 static int wag_read_packet(struct libtrace_t *libtrace, struct libtrace_packet_t *packet) {
         int numbytes;
@@ -155 +204 @@
                         continue;
                 }
+                
                 size = ntohs(((struct wag_frame_hdr *)buffer)->size);
 
+                // wag isn't in network byte order yet
+                size = htons(size);
+                //printf("%d %d\n",size,htons(size));
+
                 // read in full packet
-                if((numbytes = fifo_out_reaD(libtrace->fifo,buffer,size)) == 0) {
+                if((numbytes = fifo_out_read(libtrace->fifo,buffer,size)) == 0) {
                         fifo_out_reset(libtrace->fifo);
                         read_required = 1;
@@ -203 +257 @@
 static int wag_get_capture_length(const struct libtrace_packet_t *packet) {
         struct wag_data_frame *wagptr = (struct wag_data_frame *)packet->buffer;
-        return ntohs(wagptr->hdr.size);
+        return (wagptr->hdr.size);
+        //return ntohs(wagptr->hdr.size);
 }
 
 static int wag_get_wire_length(const struct libtrace_packet_t *packet) {
         struct wag_data_frame *wagptr = (struct wag_data_frame *)packet->buffer;
-        return ntohs(wagptr->hdr.size);
+        return (wagptr->hdr.size);
+        //return ntohs(wagptr->hdr.size);
 }