Merge pull request #1090 from randomkny/fix-enobufs

guyharris · web-flow · commit 4b753ae9123e · 2023-08-06T00:51:28.000-07:00
nflog: only increment packets_nobufs when recv() returns an error
diff --git a/pcap-netfilter-linux.c b/pcap-netfilter-linux.c
@@ -123,7 +123,7 @@ netfilter_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_c
 				handle->break_loop = 0;
 				return PCAP_ERROR_BREAK;
 			}
-			if (errno == ENOBUFS)
+			if (len == -1 && errno == ENOBUFS)
 				handlep->packets_nobufs++;
 		} while ((len == -1) && (errno == EINTR || errno == ENOBUFS));
 

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ netfilter_read_linux(pcap_t *handle, int max_packets, pcap_handler callback, u_c`
`123`	`123`	`handle->break_loop = 0;`
`124`	`124`	`return PCAP_ERROR_BREAK;`
`125`	`125`	`}`
`126`		`- if (errno == ENOBUFS)`
	`126`	`+ if (len == -1 && errno == ENOBUFS)`
`127`	`127`	`handlep->packets_nobufs++;`
`128`	`128`	`} while ((len == -1) && (errno == EINTR \|\| errno == ENOBUFS));`
`129`	`129`