--- emulation/linux/linux_socket.c	Sat Sep  6 16:44:34 2003
+++ /home/daver/src/sys/emulation/linux/linux_socket.c	Sat Sep  6 15:54:56 2003
@@ -512,20 +512,14 @@
 linux_listen(struct linux_listen_args *args, int *res)
 {
 	struct linux_listen_args linux_args;
-	struct listen_args /* {
-		int s;
-		int backlog;
-	} */ bsd_args;
 	int error;
 
-	if ((error = copyin(args, &linux_args, sizeof(linux_args))))
+	error = copyin(args, &linux_args, sizeof(linux_args));
+	if (error)
 		return (error);
 
-	bsd_args.sysmsg_result = 0;
-	bsd_args.s = linux_args.s;
-	bsd_args.backlog = linux_args.backlog;
-	error = listen(&bsd_args);
-	*res = bsd_args.sysmsg_result;
+	error = kern_listen(linux_args.s, linux_args.backlog);
+
 	return(error);
 }
 
@@ -608,22 +602,27 @@
 linux_getsockname(struct linux_getsockname_args *args, int *res)
 {
 	struct linux_getsockname_args linux_args;
-	struct getsockname_args /* {
-		int fdes;
-		caddr_t asa;
-		int *alen;
-	} */ bsd_args;
-	int error;
+	struct sockaddr *sa = NULL;
+	int error, sa_len;
 
-	if ((error = copyin(args, &linux_args, sizeof(linux_args))))
+	error = copyin(args, &linux_args, sizeof(linux_args));
+	if (error)
 		return (error);
 
-	bsd_args.sysmsg_result = 0;
-	bsd_args.fdes = linux_args.s;
-	bsd_args.asa = (caddr_t) linux_args.addr;
-	bsd_args.alen = linux_args.namelen;
-	error = ogetsockname(&bsd_args);
-	*res = bsd_args.sysmsg_result;
+	error = kern_getsockname(linux_args.s, &sa, &sa_len);
+
+	if (error == 0) {
+		/*
+		 * Convert sa to the Linux sockaddr structure.
+		 */
+		*(u_short *)sa = sa->sa_family;
+		error = copyout(sa, linux_args.addr, sa_len);
+	}
+	if (error == 0)
+		error = copyout(&sa_len, linux_args.namelen,
+		    sizeof(*linux_args.namelen));
+	if (sa)
+		FREE(sa, M_SONAME);
 	return(error);
 }
 
@@ -637,22 +636,27 @@
 linux_getpeername(struct linux_getpeername_args *args, int *res)
 {
 	struct linux_getpeername_args linux_args;
-	struct ogetpeername_args /* {
-		int fdes;
-		caddr_t asa;
-		int *alen;
-	} */ bsd_args;
-	int error;
+	struct sockaddr *sa = NULL;
+	int error, sa_len;
 
-	if ((error = copyin(args, &linux_args, sizeof(linux_args))))
+	error = copyin(args, &linux_args, sizeof(linux_args));
+	if (error)
 		return (error);
 
-	bsd_args.sysmsg_result = 0;
-	bsd_args.fdes = linux_args.s;
-	bsd_args.asa = (caddr_t) linux_args.addr;
-	bsd_args.alen = linux_args.namelen;
-	error = ogetpeername(&bsd_args);
-	*res = bsd_args.sysmsg_result;
+	error = kern_getpeername(linux_args.s, &sa, &sa_len);
+
+	if (error == 0) {
+		/*
+		 * Convert sa to the Linux sockaddr structure.
+		 */
+		*(u_short *)sa = sa->sa_family;
+		error = copyout(sa, linux_args.addr, sa_len);
+	}
+	if (error == 0)
+		error = copyout(&sa_len, linux_args.namelen,
+		    sizeof(*linux_args.namelen));
+	if (sa)
+		FREE(sa, M_SONAME);
 	return(error);
 }
 
@@ -667,27 +671,21 @@
 linux_socketpair(struct linux_socketpair_args *args, int *res)
 {
 	struct linux_socketpair_args linux_args;
-	struct socketpair_args /* {
-		int domain;
-		int type;
-		int protocol;
-		int *rsv;
-	} */ bsd_args;
-	int error;
+	int error, domain, sockv[2];
 
-	if ((error = copyin(args, &linux_args, sizeof(linux_args))))
+	error = copyin(args, &linux_args, sizeof(linux_args));
+	if (error)
 		return (error);
 
-	bsd_args.domain = linux_to_bsd_domain(linux_args.domain);
-	if (bsd_args.domain == -1)
+	domain = linux_to_bsd_domain(linux_args.domain);
+	if (domain == -1)
 		return (EINVAL);
 
-	bsd_args.sysmsg_result = 0;
-	bsd_args.type = linux_args.type;
-	bsd_args.protocol = linux_args.protocol;
-	bsd_args.rsv = linux_args.rsv;
-	error = socketpair(&bsd_args);
-	*res = bsd_args.sysmsg_result;
+	error = kern_socketpair(domain, linux_args.type, linux_args.protocol,
+	    sockv);
+
+	if (error == 0)
+		error = copyout(sockv, linux_args.rsv, sizeof(sockv));
 	return(error);
 }