diff options
| author |   bluhm <bluhm@openbsd.org> | 2018-04-06 10:39:15 +0000 |
|---|---|---|
| committer | bluhm <bluhm@openbsd.org> | 2018-04-06 10:39:15 +0000 |
| commit | bf7176672eb1aa92221be5d2f15e896e62d889de (patch) | |
| tree | 3387124ec453003b5f5baf5326da2b45cbce26d8 | |
| parent | Avoid leaking str if EVP_Digest() fails. (diff) | |
| download | wireguard-openbsd-bf7176672eb1aa92221be5d2f15e896e62d889de.tar.xz wireguard-openbsd-bf7176672eb1aa92221be5d2f15e896e62d889de.zip | |
All users of the PFLOG_PACKET() macro are inside "#if NPFLOG > 0".
So this macro does not make much sense, just call pflog_packet().
OK sashan@ henning@
| -rw-r--r-- | sys/net/if_pflog.h | 7 | ||||
| -rw-r--r-- | sys/net/pf.c | 12 |
2 files changed, 7 insertions, 12 deletions
diff --git a/sys/net/if_pflog.h b/sys/net/if_pflog.h index ac14a901e15..bd02500bf02 100644 --- a/sys/net/if_pflog.h +++ b/sys/net/if_pflog.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pflog.h,v 1.27 2017/05/16 11:36:16 mpi Exp $ */ +/* $OpenBSD: if_pflog.h,v 1.28 2018/04/06 10:39:15 bluhm Exp $ */ /* * Copyright 2001 Niels Provos <provos@citi.umich.edu> * All rights reserved. @@ -66,10 +66,5 @@ struct pflog_softc { int sc_unit; }; -#if NPFLOG > 0 -#define PFLOG_PACKET(a,b,c,d,e,f) pflog_packet(a,b,c,d,e,f) -#else -#define PFLOG_PACKET(a,b,c,d,e,f) ((void)0) -#endif /* NPFLOG > 0 */ #endif /* _KERNEL */ #endif /* _NET_IF_PFLOG_H_ */ diff --git a/sys/net/pf.c b/sys/net/pf.c index d841f834af1..96f1f9b72be 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.1063 2018/03/06 17:35:53 bluhm Exp $ */ +/* $OpenBSD: pf.c,v 1.1064 2018/04/06 10:39:15 bluhm Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -3654,7 +3654,7 @@ pf_match_rule(struct pf_test_ctx *ctx, struct pf_ruleset *ruleset) #if NPFLOG > 0 if (r->log) { REASON_SET(&ctx->reason, PFRES_MATCH); - PFLOG_PACKET(ctx->pd, ctx->reason, r, + pflog_packet(ctx->pd, ctx->reason, r, ctx->a, ruleset, NULL); } #endif /* NPFLOG > 0 */ @@ -3793,7 +3793,7 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm, #if NPFLOG > 0 if (r->log) - PFLOG_PACKET(pd, ctx.reason, r, a, ruleset, NULL); + pflog_packet(pd, ctx.reason, r, a, ruleset, NULL); if (ctx.act.log & PF_LOG_MATCHES) pf_log_matches(pd, r, a, ruleset, &ctx.rules); #endif /* NPFLOG > 0 */ @@ -7095,11 +7095,11 @@ done: struct pf_rule_item *ri; if (pd.pflog & PF_LOG_FORCE || r->log & PF_LOG_ALL) - PFLOG_PACKET(&pd, reason, r, a, ruleset, NULL); + pflog_packet(&pd, reason, r, a, ruleset, NULL); if (s) { SLIST_FOREACH(ri, &s->match_rules, entry) if (ri->r->log & PF_LOG_ALL) - PFLOG_PACKET(&pd, reason, ri->r, a, + pflog_packet(&pd, reason, ri->r, a, ruleset, NULL); } } @@ -7293,7 +7293,7 @@ pf_log_matches(struct pf_pdesc *pd, struct pf_rule *rm, struct pf_rule *am, SLIST_FOREACH(ri, matchrules, entry) if (ri->r->log & PF_LOG_MATCHES) - PFLOG_PACKET(pd, PFRES_MATCH, rm, am, ruleset, ri->r); + pflog_packet(pd, PFRES_MATCH, rm, am, ruleset, ri->r); } #endif /* NPFLOG > 0 */ |