From 3c2c1cfaf9c7a7a0a3cd4669ff61a20e9a485698 Mon Sep 17 00:00:00 2001 From: dlg Date: Fri, 11 Nov 2022 11:47:12 +0000 Subject: [PATCH] rename pfsync_up() to pfsync_is_up() foo_up() where foo is a network driver is usually a function that configures and brings an interface up into a running state. this small tweak just makes the code a bit easier for me to read. --- sys/net/if_pfsync.c | 4 ++-- sys/net/if_pfsync.h | 4 ++-- sys/net/pf.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 64a2da195ab..f69790ee98d 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.310 2022/11/11 11:22:48 sashan Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.311 2022/11/11 11:47:13 dlg Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -2571,7 +2571,7 @@ pfsync_send_plus(void *plus, size_t pluslen) } int -pfsync_up(void) +pfsync_is_up(void) { struct pfsync_softc *sc = pfsyncif; diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h index 5447b829d74..ff26ac3669e 100644 --- a/sys/net/if_pfsync.h +++ b/sys/net/if_pfsync.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.h,v 1.58 2022/11/06 18:05:05 dlg Exp $ */ +/* $OpenBSD: if_pfsync.h,v 1.59 2022/11/11 11:47:13 dlg Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -341,7 +341,7 @@ int pfsync_defer(struct pf_state *, struct mbuf *, struct pfsync_deferral **); void pfsync_undefer(struct pfsync_deferral *, int); -int pfsync_up(void); +int pfsync_is_up(void); int pfsync_state_in_use(struct pf_state *); void pfsync_iack(struct pf_state *); diff --git a/sys/net/pf.c b/sys/net/pf.c index f61449afa81..d93611288e2 100644 --- a/sys/net/pf.c +++ b/sys/net/pf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pf.c,v 1.1149 2022/11/11 11:02:35 dlg Exp $ */ +/* $OpenBSD: pf.c,v 1.1150 2022/11/11 11:47:12 dlg Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -4285,7 +4285,7 @@ pf_test_rule(struct pf_pdesc *pd, struct pf_rule **rm, struct pf_state **sm, #if NPFSYNC > 0 if (*sm != NULL && !ISSET((*sm)->state_flags, PFSTATE_NOSYNC) && - pd->dir == PF_OUT && pfsync_up()) { + pd->dir == PF_OUT && pfsync_is_up()) { /* * We want the state created, but we dont * want to send this in case a partner -- 2.20.1