system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-18 22:33:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Semi-gratuitous white space synchronization with KAME tree: to reduce

Browse source 
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.
This commit is contained in:
Robert Watson 2004-08-27 18:41:41 +00:00
parent 3161f583ca
commit 24114d445c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=134392
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
sys/netkey/keysock.c
View file

@ -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,