Author: dchagin
Date: Sun May 31 12:12:38 2009
New Revision: 193167
URL: http://svn.freebsd.org/changeset/base/193167
Log:
Split native socketpair() syscall onto kern_socketpair() which should
be used by kernel consumers and socketpair() itself.
Approved by: kib (mentor)
MFC after: 1 month
Modified:
head/sys/kern/uipc_syscalls.c
head/sys/sys/syscallsubr.h
Modified: head/sys/kern/uipc_syscalls.c
==============================================================================
--- head/sys/kern/uipc_syscalls.c Sun May 31 12:10:04 2009
(r193166)
+++ head/sys/kern/uipc_syscalls.c Sun May 31 12:12:38 2009
(r193167)
@@ -588,51 +588,43 @@ done1:
}
int
-socketpair(td, uap)
- struct thread *td;
- struct socketpair_args /* {
- int domain;
- int type;
- int protocol;
- int *rsv;
- } */ *uap;
+kern_socketpair(struct thread *td, int domain, int type, int protocol,
+ int *rsv)
{
struct filedesc *fdp = td->td_proc->p_fd;
struct file *fp1, *fp2;
struct socket *so1, *so2;
- int fd, error, sv[2];
+ int fd, error;
#ifdef MAC
/* We might want to have a separate check for socket pairs. */
- error = mac_socket_check_create(td->td_ucred, uap->domain, uap->type,
- uap->protocol);
+ error = mac_socket_check_create(td->td_ucred, domain, type,
+ protocol);
if (error)
return (error);
#endif
- error = socreate(uap->domain, &so1, uap->type, uap->protocol,
- td->td_ucred, td);
+ error = socreate(domain, &so1, type, protocol, td->td_ucred, td);
if (error)
return (error);
- error = socreate(uap->domain, &so2, uap->type, uap->protocol,
- td->td_ucred, td);
+ error = socreate(domain, &so2, type, protocol, td->td_ucred, td);
if (error)
goto free1;
/* On success extra reference to `fp1' and 'fp2' is set by falloc. */
error = falloc(td, &fp1, &fd);
if (error)
goto free2;
- sv[0] = fd;
+ rsv[0] = fd;
fp1->f_data = so1; /* so1 already has ref count */
error = falloc(td, &fp2, &fd);
if (error)
goto free3;
fp2->f_data = so2; /* so2 already has ref count */
- sv[1] = fd;
+ rsv[1] = fd;
error = soconnect2(so1, so2);
if (error)
goto free4;
- if (uap->type == SOCK_DGRAM) {
+ if (type == SOCK_DGRAM) {
/*
* Datagram socket connection is asymmetric.
*/
@@ -642,18 +634,14 @@ socketpair(td, uap)
}
finit(fp1, FREAD | FWRITE, DTYPE_SOCKET, fp1->f_data, &socketops);
finit(fp2, FREAD | FWRITE, DTYPE_SOCKET, fp2->f_data, &socketops);
- so1 = so2 = NULL;
- error = copyout(sv, uap->rsv, 2 * sizeof (int));
- if (error)
- goto free4;
fdrop(fp1, td);
fdrop(fp2, td);
return (0);
free4:
- fdclose(fdp, fp2, sv[1], td);
+ fdclose(fdp, fp2, rsv[1], td);
fdrop(fp2, td);
free3:
- fdclose(fdp, fp1, sv[0], td);
+ fdclose(fdp, fp1, rsv[0], td);
fdrop(fp1, td);
free2:
if (so2 != NULL)
@@ -664,6 +652,23 @@ free1:
return (error);
}
+int
+socketpair(struct thread *td, struct socketpair_args *uap)
+{
+ int error, sv[2];
+
+ error = kern_socketpair(td, uap->domain, uap->type,
+ uap->protocol, sv);
+ if (error)
+ return (error);
+ error = copyout(sv, uap->rsv, 2 * sizeof(int));
+ if (error) {
+ (void)kern_close(td, sv[0]);
+ (void)kern_close(td, sv[1]);
+ }
+ return (error);
+}
+
static int
sendit(td, s, mp, flags)
struct thread *td;
Modified: head/sys/sys/syscallsubr.h
==============================================================================
--- head/sys/sys/syscallsubr.h Sun May 31 12:10:04 2009 (r193166)
+++ head/sys/sys/syscallsubr.h Sun May 31 12:12:38 2009 (r193167)
@@ -220,6 +220,8 @@ int kern_utimesat(struct thread *td, int
int kern_wait(struct thread *td, pid_t pid, int *status, int options,
struct rusage *rup);
int kern_writev(struct thread *td, int fd, struct uio *auio);
+int kern_socketpair(struct thread *td, int domain, int type, int protocol,
+ int *rsv);
/* flags for kern_sigaction */
#define KSA_OSIGSET 0x0001 /* uses osigact_t */
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
