pflog: Fix the minimum header length

fxlb · fxlb · commit 5ecff0b77bee · 2023-10-27T15:27:58.000+02:00
The minimum header length (without padding) is: 61.
Move it in pflog.h.

[skip ci]
diff --git a/pflog.h b/pflog.h
@@ -128,6 +128,8 @@ struct pfloghdr {
 	nd_uint32_t	rule_uid;
 	nd_int32_t	rule_pid;
 	nd_uint8_t	dir;
+/* Minimum header length (without padding): 61 */
+#define MIN_PFLOG_HDRLEN 61
 #if defined(__OpenBSD__)
 	nd_uint8_t	rewritten;
 	nd_uint8_t	naf;
@@ -146,6 +148,3 @@ struct pfloghdr {
 	nd_uint16_t	dport;
 #endif
 };
-
-
-
diff --git a/print-pflog.c b/print-pflog.c
@@ -142,7 +142,6 @@ pflog_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
 		return;
 	}
 
-#define MIN_PFLOG_HDRLEN	45
 	hdr = (const struct pfloghdr *)p;
 	hdrlen = GET_U_1(hdr->length);
 	if (hdrlen < MIN_PFLOG_HDRLEN) {

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,6 @@ pflog_if_print(netdissect_options ndo, const struct pcap_pkthdr h,`
`142`	`142`	`return;`
`143`	`143`	`}`
`144`	`144`
`145`		`-#define MIN_PFLOG_HDRLEN 45`
`146`	`145`	`hdr = (const struct pfloghdr *)p;`
`147`	`146`	`hdrlen = GET_U_1(hdr->length);`
`148`	`147`	`if (hdrlen < MIN_PFLOG_HDRLEN) {`