SOURCES: libpcap-pf_ring.patch - typo
areq
areq at pld-linux.org
Thu Jun 14 19:55:23 CEST 2007
Author: areq Date: Thu Jun 14 17:55:23 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- typo
---- Files affected:
SOURCES:
libpcap-pf_ring.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/libpcap-pf_ring.patch
diff -u SOURCES/libpcap-pf_ring.patch:1.2 SOURCES/libpcap-pf_ring.patch:1.3
--- SOURCES/libpcap-pf_ring.patch:1.2 Thu Jun 14 17:54:58 2007
+++ SOURCES/libpcap-pf_ring.patch Thu Jun 14 19:55:17 2007
@@ -74,7 +74,7 @@
/* Allocate the buffer */
-@@ -472,6 +489,48 @@
+@@ -472,6 +489,47 @@
int packet_len, caplen;
struct pcap_pkthdr pcap_header;
@@ -100,16 +100,15 @@
+ 1 /* wait_for_incoming_packet */);
+ if (packet_len > 0) {
+ bp = handle->buffer;
-+ pcap_header.caplen = min(pcap_header.caplen, handle->bufsize);
-+ packet_len = pcap_header.len;
-+ caplen = pcap_header.caplen; /* ensure that our capture length does not exceed our snapshot length */
++ packet_len = pcap_header.len;
++ caplen = pcap_header.caplen; /* ensure that our capture length does not exceed our snapshot length */
+
-+ if (caplen > handle->snapshot)
-+ caplen = handle->snapshot;
-+ if (caplen > handle->bufsize) /* sanity check and prevent buffer overruns, paranoia in the extreme */
-+ caplen = handle->bufsize;
++ if (caplen > handle->snapshot)
++ caplen = handle->snapshot;
++ if (caplen > handle->bufsize) /* sanity check and prevent buffer overruns, paranoia in the extreme */
++ caplen = handle->bufsize;
+
-+ pcap_header.caplen = caplen; /* reset our header capture length for the callee! */
++ pcap_header.caplen = caplen; /* reset our header capture length for the callee! */
+
+ goto pfring_pcap_read_packet;
+ } else if (packet_len == -1 && errno == EINTR)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/libpcap-pf_ring.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list