From b14e72073db609ec0fb89897afe16fc5a15d3290 Mon Sep 17 00:00:00 2001 From: mlaier Date: Tue, 3 May 2005 16:43:32 +0000 Subject: Resolve conflicts created during the import of pf 3.7 Some features are missing and will be implemented in a second step. This is functional as is. Tested by: freebsd-pf, pfsense.org Obtained from: OpenBSD X-MFC after: never (breaks API/ABI) --- sys/contrib/pf/net/if_pflog.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'sys/contrib/pf/net/if_pflog.h') diff --git a/sys/contrib/pf/net/if_pflog.h b/sys/contrib/pf/net/if_pflog.h index 3050017..157dd35 100644 --- a/sys/contrib/pf/net/if_pflog.h +++ b/sys/contrib/pf/net/if_pflog.h @@ -1,5 +1,6 @@ /* $FreeBSD$ */ -/* $OpenBSD: if_pflog.h,v 1.10 2004/03/19 04:52:04 frantzen Exp $ */ +/* $OpenBSD: if_pflog.h,v 1.11 2004/05/19 17:50:51 dhartmei Exp $ */ + /* * Copyright 2001 Niels Provos * All rights reserved. @@ -35,10 +36,7 @@ struct pflog_softc { #endif }; -/* XXX keep in sync with pfvar.h */ -#ifndef PF_RULESET_NAME_SIZE -#define PF_RULESET_NAME_SIZE 16 -#endif +#define PFLOG_RULESET_NAME_SIZE 16 struct pfloghdr { u_int8_t length; @@ -46,7 +44,7 @@ struct pfloghdr { u_int8_t action; u_int8_t reason; char ifname[IFNAMSIZ]; - char ruleset[PF_RULESET_NAME_SIZE]; + char ruleset[PFLOG_RULESET_NAME_SIZE]; u_int32_t rulenr; u_int32_t subrulenr; u_int8_t dir; -- cgit v1.1