Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use socklen_t when talking to the NetBSD side of things

Browse Source
This commit is contained in:
mrg 2006-05-12 01:58:55 +00:00
parent c31382a543
commit 84e6307a04
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/compat/linux/common/linux_socket.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: linux_socket.c,v 1.60 2006/03/27 21:27:02 dyoung Exp $ */
/* $NetBSD: linux_socket.c,v 1.61 2006/05/12 01:58:55 mrg Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.60 2006/03/27 21:27:02 dyoung Exp $");
__KERNEL_RCSID(0, "$NetBSD: linux_socket.c,v 1.61 2006/05/12 01:58:55 mrg Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@ -122,7 +122,7 @@ int linux_to_bsd_tcp_sockopt __P((int));
int linux_to_bsd_udp_sockopt __P((int));
int linux_getifhwaddr __P((struct lwp *, register_t *, u_int, void *));
static int linux_sa_get __P((struct lwp *, int, caddr_t *, struct sockaddr **,
const struct osockaddr *, int *));
const struct osockaddr *, socklen_t *));
static int linux_sa_put __P((struct osockaddr *osa));
static int linux_to_bsd_msg_flags __P((int));
static int bsd_to_linux_msg_flags __P((int));
@ -384,7 +384,7 @@ linux_sys_sendto(l, v, retval)
} */ *uap = v;
struct proc *p = l->l_proc;
struct sys_sendto_args bsa;
int tolen;
socklen_t tolen;
SCARG(&bsa, s) = SCARG(uap, s);
SCARG(&bsa, buf) = SCARG(uap, msg);
@ -651,7 +651,7 @@ linux_sys_recvfrom(l, v, retval)
SCARG(&bra, len) = SCARG(uap, len);
SCARG(&bra, flags) = SCARG(uap, flags);
SCARG(&bra, from) = (struct sockaddr *) SCARG(uap, from);
SCARG(&bra, fromlenaddr) = SCARG(uap, fromlenaddr);
SCARG(&bra, fromlenaddr) = (socklen_t *)SCARG(uap, fromlenaddr);
if ((error = sys_recvfrom(l, &bra, retval)))
return (error);
@ -1049,7 +1049,7 @@ linux_sys_getsockopt(l, v, retval)
SCARG(&bga, s) = SCARG(uap, s);
SCARG(&bga, level) = linux_to_bsd_sopt_level(SCARG(uap, level));
SCARG(&bga, val) = SCARG(uap, optval);
SCARG(&bga, avalsize) = SCARG(uap, optlen);
SCARG(&bga, avalsize) = (socklen_t *)SCARG(uap, optlen);
switch (SCARG(&bga, level)) {
case SOL_SOCKET:
@ -1333,7 +1333,7 @@ linux_sys_connect(l, v, retval)
struct sockaddr *sa;
struct sys_connect_args bca;
caddr_t sg = stackgap_init(p, 0);
int namlen;
socklen_t namlen;
namlen = SCARG(uap, namelen);
error = linux_sa_get(l, SCARG(uap, s), &sg, &sa,
@ -1343,7 +1343,7 @@ linux_sys_connect(l, v, retval)
SCARG(&bca, s) = SCARG(uap, s);
SCARG(&bca, name) = sa;
SCARG(&bca, namelen) = (unsigned int) namlen;
SCARG(&bca, namelen) = namlen;
error = sys_connect(l, &bca, retval);
@ -1387,7 +1387,8 @@ linux_sys_bind(l, v, retval)
syscallarg(int) namelen;
} */ *uap = v;
struct proc *p = l->l_proc;
int error, namlen;
int error;
socklen_t namlen;
struct sys_bind_args bsa;
namlen = SCARG(uap, namelen);
@ -1465,13 +1466,13 @@ linux_sa_get(l, s, sgp, sap, osa, osalen)
caddr_t *sgp;
struct sockaddr **sap;
const struct osockaddr *osa;
int *osalen;
socklen_t *osalen;
{
int error=0, bdom;
struct sockaddr *sa, *usa;
struct osockaddr *kosa = (struct osockaddr *) &sa;
struct proc *p = l->l_proc;
int alloclen;
socklen_t alloclen;
#ifdef INET6
int oldv6size;
struct sockaddr_in6 *sin6;