Changeset 9d7d9e9

Timestamp:

04/29/06 11:42:49 (15 years ago)

Author:

Perry Lorier <perry@…>

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:

da22687

Parents:

2ba89b7

Message:

• Clarify the documentation for trace_read_packet()
• Force blocking mode in pcap

Files:

• configure.in (modified) (1 diff)
• lib/format_pcap.c (modified) (1 diff)
• lib/libtrace.h (modified) (1 diff)

configure.in

@@ -162 +162 @@
                         AC_DEFINE(HAVE_PCAP_SENDPACKET,1,[pcap has pcap_sendpacket]),
                         have_pcap_sendpacket=false)
+
+        AC_CHECK_LIB(pcap,pcap_setnonblock,
+                        AC_DEFINE(HAVE_PCAP_SETNONBLOCK,1,[pcap has pcap_setnonblock]),
+                        have_pcap_setnonblock=false)
 fi
 

lib/format_pcap.c

@@ -223 +223 @@
                 }
         }
+#ifdef HAVE_PCAP_SETNONBLOCK
+        pcap_setnonblock(&INPUT.pcap,0,errbuf);
+#endif
         return 0; /* success */
 }

lib/libtrace.h

@@ -641 +641 @@
  * @param trace         the libtrace opaque pointer
  * @param packet        the packet opaque pointer
- * @return 0 on EOF, negative value on error
- *
+ * @return 0 on EOF, negative value on error, number of bytes read when
+ * successful.
+ *
+ * @note the number of bytes read is usually (but not always) the same as
+ * trace_get_framing_length()+trace_get_capture_length() depending on the
+ * trace format.
  * @note the trace must have been started with trace_start before calling
  * this function