Whitespace change: (near) KNF

This commit is contained in:
Marcel Moolenaar 2000-08-26 05:12:16 +00:00
parent d40690a5c9
commit 3f3a4815f4

View File

@ -54,95 +54,94 @@
static int
linux_to_bsd_domain(int domain)
{
switch (domain) {
case LINUX_AF_UNSPEC:
return AF_UNSPEC;
return (AF_UNSPEC);
case LINUX_AF_UNIX:
return AF_LOCAL;
return (AF_LOCAL);
case LINUX_AF_INET:
return AF_INET;
return (AF_INET);
case LINUX_AF_AX25:
return AF_CCITT;
return (AF_CCITT);
case LINUX_AF_IPX:
return AF_IPX;
return (AF_IPX);
case LINUX_AF_APPLETALK:
return AF_APPLETALK;
default:
return -1;
return (AF_APPLETALK);
}
return (-1);
}
static int
linux_to_bsd_sockopt_level(int level)
{
switch (level) {
case LINUX_SOL_SOCKET:
return SOL_SOCKET;
default:
return level;
return (SOL_SOCKET);
}
return (level);
}
static int linux_to_bsd_ip_sockopt(int opt)
static int
linux_to_bsd_ip_sockopt(int opt)
{
switch (opt) {
case LINUX_IP_TOS:
return IP_TOS;
return (IP_TOS);
case LINUX_IP_TTL:
return IP_TTL;
return (IP_TTL);
case LINUX_IP_OPTIONS:
return IP_OPTIONS;
return (IP_OPTIONS);
case LINUX_IP_MULTICAST_IF:
return IP_MULTICAST_IF;
return (IP_MULTICAST_IF);
case LINUX_IP_MULTICAST_TTL:
return IP_MULTICAST_TTL;
return (IP_MULTICAST_TTL);
case LINUX_IP_MULTICAST_LOOP:
return IP_MULTICAST_LOOP;
return (IP_MULTICAST_LOOP);
case LINUX_IP_ADD_MEMBERSHIP:
return IP_ADD_MEMBERSHIP;
return (IP_ADD_MEMBERSHIP);
case LINUX_IP_DROP_MEMBERSHIP:
return IP_DROP_MEMBERSHIP;
return (IP_DROP_MEMBERSHIP);
case LINUX_IP_HDRINCL:
return IP_HDRINCL;
default:
return -1;
return (IP_HDRINCL);
}
return (-1);
}
static int
linux_to_bsd_so_sockopt(int opt)
{
switch (opt) {
case LINUX_SO_DEBUG:
return SO_DEBUG;
return (SO_DEBUG);
case LINUX_SO_REUSEADDR:
return SO_REUSEADDR;
return (SO_REUSEADDR);
case LINUX_SO_TYPE:
return SO_TYPE;
return (SO_TYPE);
case LINUX_SO_ERROR:
return SO_ERROR;
return (SO_ERROR);
case LINUX_SO_DONTROUTE:
return SO_DONTROUTE;
return (SO_DONTROUTE);
case LINUX_SO_BROADCAST:
return SO_BROADCAST;
return (SO_BROADCAST);
case LINUX_SO_SNDBUF:
return SO_SNDBUF;
return (SO_SNDBUF);
case LINUX_SO_RCVBUF:
return SO_RCVBUF;
return (SO_RCVBUF);
case LINUX_SO_KEEPALIVE:
return SO_KEEPALIVE;
return (SO_KEEPALIVE);
case LINUX_SO_OOBINLINE:
return SO_OOBINLINE;
return (SO_OOBINLINE);
case LINUX_SO_LINGER:
return SO_LINGER;
case LINUX_SO_PRIORITY:
case LINUX_SO_NO_CHECK:
default:
return -1;
return (SO_LINGER);
}
return (-1);
}
/* Return 0 if IP_HDRINCL is set of the given socket, not 0 otherwise */
/* Return 0 if IP_HDRINCL is set for the given socket. */
static int
linux_check_hdrincl(struct proc *p, int s)
{
@ -162,18 +161,21 @@ linux_check_hdrincl(struct proc *p, int s)
val = stackgap_alloc(&sg, sizeof(int));
valsize = stackgap_alloc(&sg, sizeof(int));
if ((error=copyout(&size_val, valsize, sizeof(size_val))))
return error;
if ((error = copyout(&size_val, valsize, sizeof(size_val))))
return (error);
bsd_args.s = s;
bsd_args.level = IPPROTO_IP;
bsd_args.name = IP_HDRINCL;
bsd_args.val = val;
bsd_args.avalsize = (int *)valsize;
if ((error=getsockopt(p, &bsd_args)))
return error;
if ((error=copyin(val, &optval, sizeof(optval))))
return error;
return optval == 0;
if ((error = getsockopt(p, &bsd_args)))
return (error);
if ((error = copyin(val, &optval, sizeof(optval))))
return (error);
return (optval == 0);
}
/*
@ -205,7 +207,7 @@ linux_sendto_hdrincl(struct proc *p, struct sendto_args *bsd_args)
/* Check the packet isn't too small before we mess with it */
if (bsd_args->len < linux_ip_copysize)
return EINVAL;
return (EINVAL);
/*
* Tweaking the user buffer in place would be bad manners.
@ -219,8 +221,8 @@ linux_sendto_hdrincl(struct proc *p, struct sendto_args *bsd_args)
iov = (struct iovec *)stackgap_alloc(&sg, sizeof(*iov)*2);
/* Make a copy of the beginning of the packet to be sent */
if ((error = copyin(bsd_args->buf, (caddr_t)packet, linux_ip_copysize)))
return error;
if ((error = copyin(bsd_args->buf, packet, linux_ip_copysize)))
return (error);
/* Convert fields from Linux to BSD raw IP socket format */
packet->ip_len = bsd_args->len;
@ -242,7 +244,7 @@ linux_sendto_hdrincl(struct proc *p, struct sendto_args *bsd_args)
sendmsg_args.s = bsd_args->s;
sendmsg_args.msg = (caddr_t)msg;
sendmsg_args.flags = bsd_args->flags;
return sendmsg(p, &sendmsg_args);
return (sendmsg(p, &sendmsg_args));
}
struct linux_socket_args {
@ -263,13 +265,14 @@ linux_socket(struct proc *p, struct linux_socket_args *args)
int error;
int retval_socket;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.protocol = linux_args.protocol;
bsd_args.type = linux_args.type;
bsd_args.domain = linux_to_bsd_domain(linux_args.domain);
if (bsd_args.domain == -1)
return EINVAL;
return (EINVAL);
retval_socket = socket(p, &bsd_args);
if (bsd_args.type == SOCK_RAW
@ -300,7 +303,8 @@ linux_socket(struct proc *p, struct linux_socket_args *args)
/* Copy back the return value from socket() */
p->p_retval[0] = bsd_setsockopt_args.s;
}
return retval_socket;
return (retval_socket);
}
struct linux_bind_args {
@ -320,12 +324,13 @@ linux_bind(struct proc *p, struct linux_bind_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.name = (caddr_t)linux_args.name;
bsd_args.namelen = linux_args.namelen;
return bind(p, &bsd_args);
return (bind(p, &bsd_args));
}
struct linux_connect_args {
@ -345,8 +350,9 @@ linux_connect(struct proc *p, struct linux_connect_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.name = (caddr_t)linux_args.name;
bsd_args.namelen = linux_args.namelen;
@ -384,7 +390,7 @@ linux_connect(struct proc *p, struct linux_connect_args *args)
statusl = stackgap_alloc(&sg, sizeof statusl);
if ((error = copyout(&statl, statusl, sizeof statl)))
return error;
return (error);
bsd_getsockopt_args.s = linux_args.s;
bsd_getsockopt_args.level = SOL_SOCKET;
@ -394,14 +400,17 @@ linux_connect(struct proc *p, struct linux_connect_args *args)
error = getsockopt(p, &bsd_getsockopt_args);
if (error)
return error;
return (error);
if ((error = copyin(status, &stat, sizeof stat)))
return error;
return (error);
p->p_retval[0] = stat;
return 0;
return (0);
}
}
return error;
return (error);
}
struct linux_listen_args {
@ -419,11 +428,12 @@ linux_listen(struct proc *p, struct linux_listen_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.backlog = linux_args.backlog;
return listen(p, &bsd_args);
return (listen(p, &bsd_args));
}
struct linux_accept_args {
@ -448,8 +458,9 @@ linux_accept(struct proc *p, struct linux_accept_args *args)
} */ f_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.name = (caddr_t)linux_args.addr;
bsd_args.anamelen = linux_args.namelen;
@ -487,12 +498,13 @@ linux_getsockname(struct proc *p, struct linux_getsockname_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.fdes = linux_args.s;
bsd_args.asa = (caddr_t) linux_args.addr;
bsd_args.alen = linux_args.namelen;
return ogetsockname(p, &bsd_args);
return (ogetsockname(p, &bsd_args));
}
struct linux_getpeername_args {
@ -512,12 +524,13 @@ linux_getpeername(struct proc *p, struct linux_getpeername_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.fdes = linux_args.s;
bsd_args.asa = (caddr_t) linux_args.addr;
bsd_args.alen = linux_args.namelen;
return ogetpeername(p, &bsd_args);
return (ogetpeername(p, &bsd_args));
}
struct linux_socketpair_args {
@ -539,15 +552,17 @@ linux_socketpair(struct proc *p, struct linux_socketpair_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.domain = linux_to_bsd_domain(linux_args.domain);
if (bsd_args.domain == -1)
return EINVAL;
return (EINVAL);
bsd_args.type = linux_args.type;
bsd_args.protocol = linux_args.protocol;
bsd_args.rsv = linux_args.rsv;
return socketpair(p, &bsd_args);
return (socketpair(p, &bsd_args));
}
struct linux_send_args {
@ -569,13 +584,14 @@ linux_send(struct proc *p, struct linux_send_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.buf = linux_args.msg;
bsd_args.len = linux_args.len;
bsd_args.flags = linux_args.flags;
return osend(p, &bsd_args);
return (osend(p, &bsd_args));
}
struct linux_recv_args {
@ -597,13 +613,14 @@ linux_recv(struct proc *p, struct linux_recv_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.buf = linux_args.msg;
bsd_args.len = linux_args.len;
bsd_args.flags = linux_args.flags;
return orecv(p, &bsd_args);
return (orecv(p, &bsd_args));
}
struct linux_sendto_args {
@ -629,8 +646,9 @@ linux_sendto(struct proc *p, struct linux_sendto_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.buf = linux_args.msg;
bsd_args.len = linux_args.len;
@ -640,9 +658,9 @@ linux_sendto(struct proc *p, struct linux_sendto_args *args)
if (linux_check_hdrincl(p, linux_args.s) == 0)
/* IP_HDRINCL set, tweak the packet before sending */
return linux_sendto_hdrincl(p, &bsd_args);
return (linux_sendto_hdrincl(p, &bsd_args));
return sendto(p, &bsd_args);
return (sendto(p, &bsd_args));
}
struct linux_recvfrom_args {
@ -668,15 +686,16 @@ linux_recvfrom(struct proc *p, struct linux_recvfrom_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.buf = linux_args.buf;
bsd_args.len = linux_args.len;
bsd_args.flags = linux_args.flags;
bsd_args.from = linux_args.from;
bsd_args.fromlenaddr = linux_args.fromlen;
return orecvfrom(p, &bsd_args);
return (orecvfrom(p, &bsd_args));
}
struct linux_shutdown_args {
@ -694,11 +713,12 @@ linux_shutdown(struct proc *p, struct linux_shutdown_args *args)
} */ bsd_args;
int error;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.how = linux_args.how;
return shutdown(p, &bsd_args);
return (shutdown(p, &bsd_args));
}
struct linux_setsockopt_args {
@ -722,8 +742,9 @@ linux_setsockopt(struct proc *p, struct linux_setsockopt_args *args)
} */ bsd_args;
int error, name;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.level = linux_to_bsd_sockopt_level(linux_args.level);
switch (bsd_args.level) {
@ -738,14 +759,16 @@ linux_setsockopt(struct proc *p, struct linux_setsockopt_args *args)
name = linux_args.optname;
break;
default:
return EINVAL;
name = -1;
break;
}
if (name == -1)
return EINVAL;
return (EINVAL);
bsd_args.name = name;
bsd_args.val = linux_args.optval;
bsd_args.valsize = linux_args.optlen;
return setsockopt(p, &bsd_args);
return (setsockopt(p, &bsd_args));
}
struct linux_getsockopt_args {
@ -769,8 +792,9 @@ linux_getsockopt(struct proc *p, struct linux_getsockopt_args *args)
} */ bsd_args;
int error, name;
if ((error=copyin((caddr_t)args, (caddr_t)&linux_args, sizeof(linux_args))))
return error;
if ((error = copyin(args, &linux_args, sizeof(linux_args))))
return (error);
bsd_args.s = linux_args.s;
bsd_args.level = linux_to_bsd_sockopt_level(linux_args.level);
switch (bsd_args.level) {
@ -785,50 +809,53 @@ linux_getsockopt(struct proc *p, struct linux_getsockopt_args *args)
name = linux_args.optname;
break;
default:
return EINVAL;
name = -1;
break;
}
if (name == -1)
return EINVAL;
return (EINVAL);
bsd_args.name = name;
bsd_args.val = linux_args.optval;
bsd_args.avalsize = linux_args.optlen;
return getsockopt(p, &bsd_args);
return (getsockopt(p, &bsd_args));
}
int
linux_socketcall(struct proc *p, struct linux_socketcall_args *args)
{
switch (args->what) {
case LINUX_SOCKET:
return linux_socket(p, args->args);
return (linux_socket(p, args->args));
case LINUX_BIND:
return linux_bind(p, args->args);
return (linux_bind(p, args->args));
case LINUX_CONNECT:
return linux_connect(p, args->args);
return (linux_connect(p, args->args));
case LINUX_LISTEN:
return linux_listen(p, args->args);
return (linux_listen(p, args->args));
case LINUX_ACCEPT:
return linux_accept(p, args->args);
return (linux_accept(p, args->args));
case LINUX_GETSOCKNAME:
return linux_getsockname(p, args->args);
return (linux_getsockname(p, args->args));
case LINUX_GETPEERNAME:
return linux_getpeername(p, args->args);
return (linux_getpeername(p, args->args));
case LINUX_SOCKETPAIR:
return linux_socketpair(p, args->args);
return (linux_socketpair(p, args->args));
case LINUX_SEND:
return linux_send(p, args->args);
return (linux_send(p, args->args));
case LINUX_RECV:
return linux_recv(p, args->args);
return (linux_recv(p, args->args));
case LINUX_SENDTO:
return linux_sendto(p, args->args);
return (linux_sendto(p, args->args));
case LINUX_RECVFROM:
return linux_recvfrom(p, args->args);
return (linux_recvfrom(p, args->args));
case LINUX_SHUTDOWN:
return linux_shutdown(p, args->args);
return (linux_shutdown(p, args->args));
case LINUX_SETSOCKOPT:
return linux_setsockopt(p, args->args);
return (linux_setsockopt(p, args->args));
case LINUX_GETSOCKOPT:
return linux_getsockopt(p, args->args);
return (linux_getsockopt(p, args->args));
case LINUX_SENDMSG:
do {
int error;
@ -840,35 +867,38 @@ linux_socketcall(struct proc *p, struct linux_socketcall_args *args)
int flags;
} *uap = args->args;
error = copyin(&uap->msg->msg_control,
&control, sizeof(caddr_t));
error = copyin(&uap->msg->msg_control, &control,
sizeof(caddr_t));
if (error)
return error;
return (error);
if (control == NULL)
goto done;
error = copyin(&((struct cmsghdr *)control)->cmsg_level,
error = copyin(&((struct cmsghdr*)control)->cmsg_level,
&level, sizeof(int));
if (error)
return error;
return (error);
if (level == 1) {
/*
* Linux thinks that SOL_SOCKET is 1; we know that it's really
* 0xffff, of course.
* Linux thinks that SOL_SOCKET is 1; we know
* that it's really 0xffff, of course.
*/
level = SOL_SOCKET;
error = copyout(&level, &((struct cmsghdr *)control)->
cmsg_level, sizeof(int));
error = copyout(&level,
&((struct cmsghdr *)control)->cmsg_level,
sizeof(int));
if (error)
return error;
return (error);
}
done:
return sendmsg(p, args->args);
return (sendmsg(p, args->args));
} while (0);
case LINUX_RECVMSG:
return recvmsg(p, args->args);
default:
uprintf("LINUX: 'socket' typ=%d not implemented\n", args->what);
return ENOSYS;
return (recvmsg(p, args->args));
}
uprintf("LINUX: 'socket' typ=%d not implemented\n", args->what);
return (ENOSYS);
}