diff options
| author |   mcbride <mcbride@openbsd.org> | 2005-01-20 17:47:38 +0000 |
|---|---|---|
| committer | mcbride <mcbride@openbsd.org> | 2005-01-20 17:47:38 +0000 |
| commit | 3ca896aff6da3263e6393cc76edc1ea255f460c8 (patch) | |
| tree | 85c7f67ae202fd4750c992ef260af3734db131f5 /sys/net | |
| parent | add /usr/libdata/ldscripts/ (diff) | |
| download | wireguard-openbsd-3ca896aff6da3263e6393cc76edc1ea255f460c8.tar.xz wireguard-openbsd-3ca896aff6da3263e6393cc76edc1ea255f460c8.zip | |
Use syncdev instead of syncif in ifconfig, and modify ioctl struct pfsyncreq
in kernel code to match. Brings pfsync in line with carp, vlan and pppoe
devices. Old syncif and -syncif options still work, will be removed later.
ok markus@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/if_pfsync.c | 8 | ||||
| -rw-r--r-- | sys/net/if_pfsync.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index 9a32c528161..37a739606ae 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.42 2004/12/16 00:45:34 mcbride Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.43 2005/01/20 17:47:38 mcbride Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -768,7 +768,7 @@ pfsyncioctl(struct ifnet *ifp, u_long cmd, caddr_t data) case SIOCGETPFSYNC: bzero(&pfsyncr, sizeof(pfsyncr)); if (sc->sc_sync_ifp) - strlcpy(pfsyncr.pfsyncr_syncif, + strlcpy(pfsyncr.pfsyncr_syncdev, sc->sc_sync_ifp->if_xname, IFNAMSIZ); pfsyncr.pfsyncr_syncpeer = sc->sc_sync_peer; pfsyncr.pfsyncr_maxupdates = sc->sc_maxupdates; @@ -791,7 +791,7 @@ pfsyncioctl(struct ifnet *ifp, u_long cmd, caddr_t data) return (EINVAL); sc->sc_maxupdates = pfsyncr.pfsyncr_maxupdates; - if (pfsyncr.pfsyncr_syncif[0] == 0) { + if (pfsyncr.pfsyncr_syncdev[0] == 0) { sc->sc_sync_ifp = NULL; if (sc->sc_mbuf_net != NULL) { /* Don't keep stale pfsync packets around. */ @@ -808,7 +808,7 @@ pfsyncioctl(struct ifnet *ifp, u_long cmd, caddr_t data) break; } - if ((sifp = ifunit(pfsyncr.pfsyncr_syncif)) == NULL) + if ((sifp = ifunit(pfsyncr.pfsyncr_syncdev)) == NULL) return (EINVAL); s = splnet(); diff --git a/sys/net/if_pfsync.h b/sys/net/if_pfsync.h index ffd2a8fa029..ddd049a81fd 100644 --- a/sys/net/if_pfsync.h +++ b/sys/net/if_pfsync.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.h,v 1.18 2004/12/14 13:41:01 mickey Exp $ */ +/* $OpenBSD: if_pfsync.h,v 1.19 2005/01/20 17:47:38 mcbride Exp $ */ /* * Copyright (c) 2001 Michael Shalayeff @@ -221,7 +221,7 @@ struct pfsyncstats { * Configuration structure for SIOCSETPFSYNC SIOCGETPFSYNC */ struct pfsyncreq { - char pfsyncr_syncif[IFNAMSIZ]; + char pfsyncr_syncdev[IFNAMSIZ]; struct in_addr pfsyncr_syncpeer; int pfsyncr_maxupdates; int pfsyncr_authlevel; |