Changeset a6d38b6 for lib

Timestamp:

11/02/04 16:23:59 (17 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:

4389bd1

Parents:

aa27e1e

Message:

updated capture example

fixed bug in DAG read path of libtrace where it wasn't reading from the memory hole correctly

File:

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

lib/trace.c

@@ -485 +485 @@
                                 switch(libtrace->format) {
                                         case DAG:
-                                                
+
+                                                libtrace->dag.bottom = libtrace->dag.top;
                                                 libtrace->dag.top = dag_offset(
                                                                 libtrace->input.fd,
@@ -493 +494 @@
                                                         libtrace->dag.bottom;
                                                 
-                                                //recptr = (dag_record_t *) ((void *)libtrace->buf + (bottom + curr));
-                                                //rlen = ntohs(recptr->rlen);
-
-                                                
-                                                //memcpy(buffer,(void *)(libtrace->buf + (bottom + curr)),diff);
-                                                
-                                                //buffer=libtrace->buf + (bottom + curr);
-
                                                 numbytes=libtrace->dag.diff;
-                                                libtrace->dag.bottom = libtrace->dag.top;
                                                 libtrace->dag.offset = 0;
                                                 
@@ -604 +596 @@
 
         if (libtrace->format == DAG) {
-                // we can do some zero-copy stuff here
-                while(1) {
-                        if (libtrace->dag.diff == 0) {
-                                if ((numbytes = trace_read(libtrace,buf,RP_BUFSIZE)) <= 0) 
-                                        return numbytes;
-                        }
-                        // DAG always gives us whole packets.
-
-                        erfptr = (dag_record_t *) (libtrace->dag.buf + libtrace->dag.offset);
-                        size = ntohs(erfptr->rlen);
-
-                        assert( (size - sizeof(dag_record_t)) < LIBTRACE_PACKET_BUFSIZE);
-
-                        memcpy(packet->buffer, erfptr, size);
-                        //packet->buffer = (void *)erfptr;
-                        packet->size = size;
-                        libtrace->dag.offset += size;
-                        libtrace->dag.diff -= size;
-
-                        return (size);
+                if (libtrace->dag.diff == 0) {
+                        if ((numbytes = trace_read(libtrace,buf,RP_BUFSIZE)) <= 0) 
+                                return numbytes;
+                }
+                // DAG always gives us whole packets.
+
+                erfptr = (dag_record_t *) ((void *)libtrace->dag.buf + (libtrace->dag.bottom + libtrace->dag.offset));
+                size = ntohs(erfptr->rlen);
+
+                if ( size  > LIBTRACE_PACKET_BUFSIZE) {
+                        printf("%d\n",size);
+                        assert( size < LIBTRACE_PACKET_BUFSIZE);
+                }
+
+                // have to copy it out of the memory hole at this stage:
+                memcpy(packet->buffer, erfptr, size);
+
+                packet->size = size;
+                libtrace->dag.offset += size;
+                libtrace->dag.diff -= size;
+                
+                assert(libtrace->dag.diff >= 0);
+                //assert(libtrace->dag.offset <= libtrace->dag.top);
+                return (size);
                         
-                }
         }
         do {
@@ -649 +644 @@
 
                                 /* FALL THRU */
-                        case ERF:
-                        case DAG:
+                        //case ERF:
+                        //case DAG:
                                 // read in the erf header
                                 if ((numbytes = fifo_out_read(libtrace->fifo, buffer, sizeof(dag_record_t))) == 0) {