From fd88c4dfd25d01aebe5ac774ed9a47cd91ff70da Mon Sep 17 00:00:00 2001 From: Daniel Hartmeier Date: Tue, 15 Jul 2003 20:27:28 +0000 Subject: Adjust pflog after recent byte order changes, fixes the 'truncated-ip' errors on pflog0. Reported and tested by Ben Lovett. ok frantzen@, cedric@ --- sys/net/if_pflog.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'sys/net/if_pflog.h') diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h index 1b22c328771..9333f48eebf 100644 --- a/sys/net/if_pflog.h +++ b/sys/net/if_pflog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflog.h,v 1.8 2003/05/14 08:42:00 canacar Exp $ */ +/* $OpenBSD: if_pflog.h,v 1.9 2003/07/15 20:27:27 dhartmei Exp $ */ /* * Copyright 2001 Niels Provos * All rights reserved. @@ -67,18 +67,7 @@ struct old_pfloghdr { #ifdef _KERNEL #if NPFLOG > 0 -#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) \ - do { \ - if (b == AF_INET) { \ - HTONS(((struct ip *)x)->ip_len); \ - HTONS(((struct ip *)x)->ip_off); \ - pflog_packet(i,a,b,c,d,e,f,g); \ - NTOHS(((struct ip *)x)->ip_len); \ - NTOHS(((struct ip *)x)->ip_off); \ - } else { \ - pflog_packet(i,a,b,c,d,e,f,g); \ - } \ - } while (0) +#define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) pflog_packet(i,a,b,c,d,e,f,g) #else #define PFLOG_PACKET(i,x,a,b,c,d,e,f,g) ((void)0) #endif /* NPFLOG > 0 */ -- cgit v1.2.3