diff options
| author | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:43:32 +0000 |
|---|---|---|
| committer | mlaier <mlaier@FreeBSD.org> | 2005-05-03 16:43:32 +0000 |
| commit | b14e72073db609ec0fb89897afe16fc5a15d3290 (patch) | |
| tree | c89a2417dc919aa1ce54db59627c344530c85d79 /sys/contrib/pf/net/if_pflog.h | |
| parent | 33ac8108e208b013f6a23863636e022de6effb3a (diff) | |
| download | FreeBSD-src-b14e72073db609ec0fb89897afe16fc5a15d3290.zip FreeBSD-src-b14e72073db609ec0fb89897afe16fc5a15d3290.tar.gz | |
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)
Diffstat (limited to 'sys/contrib/pf/net/if_pflog.h')
| -rw-r--r-- | sys/contrib/pf/net/if_pflog.h | 10 |
1 files changed, 4 insertions, 6 deletions
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 <provos@citi.umich.edu> * 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; |
