diff options
| author | rwatson <rwatson@FreeBSD.org> | 2004-08-27 18:41:41 +0000 |
|---|---|---|
| committer | rwatson <rwatson@FreeBSD.org> | 2004-08-27 18:41:41 +0000 |
| commit | 2581832493561dcf12eca4ff103a36e28466023d (patch) | |
| tree | aecdac43757e3b78c627d7dc1b3314d3f358770d /sys | |
| parent | 21264022388cc795478511d03b72ddc0ce213c5b (diff) | |
| download | FreeBSD-src-2581832493561dcf12eca4ff103a36e28466023d.zip FreeBSD-src-2581832493561dcf12eca4ff103a36e28466023d.tar.gz | |
Semi-gratuitous white space synchronization with KAME tree: to reduce
diffs against #ifdef'd version of IPSEC, use "struct thread *p"
rather than "struct proc *p", fix some white space, and make some
already inconsistent white space inconsiste differently.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netkey/keysock.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/sys/netkey/keysock.c b/sys/netkey/keysock.c index ef1b134..58409cd 100644 --- a/sys/netkey/keysock.c +++ b/sys/netkey/keysock.c @@ -34,7 +34,7 @@ __FBSDID("$FreeBSD$"); #include "opt_ipsec.h" -/* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */ +/* This code has derived from sys/net/rtsock.c on FreeBSD 2.2.5 */ #include <sys/types.h> #include <sys/param.h> @@ -305,7 +305,7 @@ key_abort(struct socket *so) * derived from net/rtsock.c:rts_attach() */ static int -key_attach(struct socket *so, int proto, struct thread *td) +key_attach(struct socket *so, int proto, struct thread *p) { struct keycb *kp; int s, error; @@ -326,7 +326,7 @@ key_attach(struct socket *so, int proto, struct thread *td) */ s = splnet(); so->so_pcb = (caddr_t)kp; - error = raw_usrreqs.pru_attach(so, proto, td); + error = raw_usrreqs.pru_attach(so, proto, p); kp = (struct keycb *)sotorawcb(so); if (error) { free(kp, M_PCB); @@ -354,11 +354,11 @@ key_attach(struct socket *so, int proto, struct thread *td) * derived from net/rtsock.c:rts_bind() */ static int -key_bind(struct socket *so, struct sockaddr *nam, struct thread *td) +key_bind(struct socket *so, struct sockaddr *nam, struct thread *p) { int s, error; s = splnet(); - error = raw_usrreqs.pru_bind(so, nam, td); /* xxx just EINVAL */ + error = raw_usrreqs.pru_bind(so, nam, p); /* xxx just EINVAL */ splx(s); return error; } @@ -368,11 +368,11 @@ key_bind(struct socket *so, struct sockaddr *nam, struct thread *td) * derived from net/rtsock.c:rts_connect() */ static int -key_connect(struct socket *so, struct sockaddr *nam, struct thread *td) +key_connect(struct socket *so, struct sockaddr *nam, struct thread *p) { int s, error; s = splnet(); - error = raw_usrreqs.pru_connect(so, nam, td); /* XXX just EINVAL */ + error = raw_usrreqs.pru_connect(so, nam, p); /* XXX just EINVAL */ splx(s); return error; } @@ -435,11 +435,11 @@ key_peeraddr(struct socket *so, struct sockaddr **nam) */ static int key_send(struct socket *so, int flags, struct mbuf *m, struct sockaddr *nam, - struct mbuf *control, struct thread *td) + struct mbuf *control, struct thread *p) { int s, error; s = splnet(); - error = raw_usrreqs.pru_send(so, flags, m, nam, control, td); + error = raw_usrreqs.pru_send(so, flags, m, nam, control, p); splx(s); return error; } @@ -473,7 +473,9 @@ key_sockaddr(struct socket *so, struct sockaddr **nam) } struct pr_usrreqs key_usrreqs = { - key_abort, pru_accept_notsupp, key_attach, key_bind, + key_abort, pru_accept_notsupp, + key_attach, + key_bind, key_connect, pru_connect2_notsupp, pru_control_notsupp, key_detach, key_disconnect, pru_listen_notsupp, key_peeraddr, |
