Changeset 8cecc7c for lib

Timestamp:

12/18/06 16:44:37 (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:

5e85c23

Parents:

eb27e8e

Message:

Looks like we need the get_next_record after all - for some reason dag_advance_stream doesn't deal in whole records like dag_offset did in 2.4

File:

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

lib/format_erf.c

@@ -550 +550 @@
 
 dag_record_t *dag_get_record(libtrace_t *libtrace) {
-        dag_record_t *erfptr;
+        dag_record_t *erfptr = NULL;
         uint16_t size;
 #ifdef DAG_VERSION_2_4
         erfptr = (dag_record_t *) ((char *)DAG.buf + (DAG.bottom + DAG.offset));
 #else
-        erfptr = (dag_record_t *) DAG.bottom;   
-#endif
+        erfptr = (dag_record_t *) dag_rx_stream_next_record(INPUT.fd,
+                        DAG.dagstream); 
+#endif
+        if (!erfptr)
+                return NULL;
         size = ntohs(erfptr->rlen);
         assert( size >= dag_record_size );
@@ -586 +589 @@
         int size = 0;
         struct timeval tv;
-        dag_record_t *erfptr;
+        dag_record_t *erfptr = NULL;
 
         if (DUCK.last_pkt - DUCK.last_duck > DUCK.duck_freq && 
@@ -611 +614 @@
                 if (numbytes < 0)
                         return numbytes;
-        } while (numbytes == 0);
-
-        erfptr = dag_get_record(libtrace);
+                if (numbytes == 0)
+                        continue;
+                erfptr = dag_get_record(libtrace);
+                
+        } while (erfptr == NULL);
+
         dag_form_packet(erfptr, packet);