Changeset 6676de4 in rtems-libbsd

Timestamp:

10/14/13 07:48:56 (9 years ago)

Author:

Sebastian Huber <sebastian.huber@…>

Branches:

4.11, 5, 5-freebsd-12, 6-freebsd-12, freebsd-9.3, master

Children:

7c36251

Parents:

e5393a3

git-author:

Sebastian Huber <sebastian.huber@…> (10/14/13 07:48:56)

git-committer:

Sebastian Huber <sebastian.huber@…> (10/31/13 12:18:47)

Message:

Use connect() from FreeBSD

Files:

• freebsd/sys/kern/uipc_syscalls.c (modified) (3 diffs)
• freebsd/sys/sys/sysproto.h (modified) (1 diff)
• rtemsbsd/include/machine/rtems-bsd-syscall-api.h (modified) (1 diff)
• rtemsbsd/rtems/rtems-bsd-syscalls.c (modified) (1 diff)
• testsuite/syscalls01/test_main.c (modified) (2 diffs)

freebsd/sys/kern/uipc_syscalls.c

@@ -609 +609 @@
 }
 #endif /* COMPAT_OLDSOCK */
+#endif /* __rtems__ */
 
 /* ARGSUSED */
-int
-connect(td, uap)
+#ifndef __rtems__
+int
+#else /* __rtems__ */
+static int kern_connect(struct thread *, int, struct sockaddr *);
+
+static int
+rtems_bsd_connect(td, uap)
+#endif /* __rtems__ */
         struct thread *td;
         struct connect_args /* {
@@ -631 +638 @@
         return (error);
 }
+#ifdef __rtems__
+int
+connect(int socket, const struct sockaddr *address, socklen_t address_len)
+{
+        struct thread *td = rtems_bsd_get_curthread_or_null();
+        struct connect_args ua = {
+                .s = socket,
+                .name = (caddr_t) address,
+                .namelen = address_len
+        };
+        int error;
+
+        if (td != NULL) {
+                error = rtems_bsd_connect(td, &ua);
+        } else {
+                error = ENOMEM;
+        }
+
+        return rtems_bsd_error_to_status_and_errno(error);
+}
+#endif /* __rtems__ */
 
 
@@ -694 +722 @@
 }
 
+#ifndef __rtems__
 int
 kern_socketpair(struct thread *td, int domain, int type, int protocol,

freebsd/sys/sys/sysproto.h

@@ -357 +357 @@
         char protocol_l_[PADL_(int)]; int protocol; char protocol_r_[PADR_(int)];
 };
-#ifndef __rtems__
 struct connect_args {
         char s_l_[PADL_(int)]; int s; char s_r_[PADR_(int)];
         char name_l_[PADL_(caddr_t)]; caddr_t name; char name_r_[PADR_(caddr_t)];
+#ifndef __rtems__
         char namelen_l_[PADL_(int)]; int namelen; char namelen_r_[PADR_(int)];
-};
+#else /* __rtems__ */
+        char namelen_l_[PADL_(__socklen_t)]; __socklen_t namelen; char namelen_r_[PADR_(__socklen_t)];
+#endif /* __rtems__ */
+};
+#ifndef __rtems__
 struct getpriority_args {
         char which_l_[PADL_(int)]; int which; char which_r_[PADR_(int)];

rtemsbsd/include/machine/rtems-bsd-syscall-api.h

@@ -58 +58 @@
 int     bind(int, const struct sockaddr *, socklen_t);
 
+int     connect(int, const struct sockaddr *, socklen_t);
+
 int     shutdown(int, int);
 

rtemsbsd/rtems/rtems-bsd-syscalls.c

@@ -165 +165 @@
  *********************************************************************
  */
-int
-kern_connect(td, fd, sa)
-        struct thread *td;
-        int fd;
-        struct sockaddr *sa;
-{
-        struct socket *so;
-        int error;
-        int interrupted = 0;
-
-        if ((so = rtems_bsdnet_fdToSocket (fd)) == NULL) {
-                error = EBADF;
-                return (error);
-        }
-
-        if (so->so_state & SS_ISCONNECTING) {
-                error = EALREADY;
-                goto done1;
-        }
-#ifdef KTRACE
-        if (KTRPOINT(td, KTR_STRUCT))
-                ktrsockaddr(sa);
-#endif
-#ifdef MAC
-        error = mac_socket_check_connect(td->td_ucred, so, sa);
-        if (error)
-                goto bad;
-#endif
-        error = soconnect(so, sa, td);
-        if (error)
-                goto bad;
-        if ((so->so_state & SS_NBIO) && (so->so_state & SS_ISCONNECTING)) {
-                error = EINPROGRESS;
-                goto done1;
-        }
-        SOCK_LOCK(so);
-        while ((so->so_state & SS_ISCONNECTING) && so->so_error == 0) {
-                error = msleep(&so->so_timeo, SOCK_MTX(so), PSOCK | PCATCH,
-                    "connec", 0);
-                if (error) {
-                        if (error == EINTR || error == ERESTART)
-                                interrupted = 1;
-                        break;
-                }
-        }
-        if (error == 0) {
-                error = so->so_error;
-                so->so_error = 0;
-        }
-        SOCK_UNLOCK(so);
-bad:
-        if (!interrupted)
-                so->so_state &= ~SS_ISCONNECTING;
-        if (error == ERESTART)
-                error = EINTR;
-done1:
-        return (error);
-}
-
-int
-connect (int s, struct sockaddr *name, int namelen)
-{
-        int error;
-        struct sockaddr *sa;
-        struct thread *td;
-
-        error = getsockaddr(&sa, name, namelen);
-        if (error == 0)
-        {
-                td = curthread;
-                error = kern_connect(td, s, sa);
-                free(sa, M_SONAME);
-        }
-        if( error == 0 )
-        {
-                return error;
-        }
-        errno = error;
-        return -1;
-}
 
 int

testsuite/syscalls01/test_main.c

@@ -567 +567 @@
 
 static void
+no_mem_socket_connect(int fd)
+{
+        struct sockaddr_in addr;
+        int rv;
+
+        errno = 0;
+        rv = connect(fd, (const struct sockaddr *) &addr, sizeof(addr));
+        assert(rv == -1);
+        assert(errno == ENOMEM);
+}
+
+static void
+test_socket_connect(void)
+{
+        rtems_resource_snapshot snapshot;
+        struct sockaddr_in addr;
+        int sd;
+        int rv;
+
+        puts("test socket connect");
+
+        rtems_resource_snapshot_take(&snapshot);
+
+        init_addr(&addr);
+
+        sd = socket(PF_INET, SOCK_DGRAM, 0);
+        assert(sd >= 0);
+
+        do_no_mem_test(no_mem_socket_connect, sd);
+
+        errno = 0;
+        rv = connect(sd, (const struct sockaddr *) &addr, SOCK_MAXADDRLEN + 1);
+        assert(rv == -1);
+        assert(errno == ENAMETOOLONG);
+
+        errno = 0;
+        rv = connect(sd, (const struct sockaddr *) &addr, 0);
+        assert(rv == -1);
+        assert(errno == EINVAL);
+
+        errno = 0;
+        rv = connect(sd, (const struct sockaddr *) &addr, sizeof(addr));
+        assert(rv == -1);
+        assert(errno == ENETUNREACH);
+
+        rv = close(sd);
+        assert(rv == 0);
+
+        errno = 0;
+        rv = connect(sd, (struct sockaddr *) &addr, sizeof(addr));
+        assert(rv == -1);
+        assert(errno == EBADF);
+
+        assert(rtems_resource_snapshot_check(&snapshot));
+}
+
+static void
 test_main(void)
 {
@@ -576 +633 @@
         test_socket_ioctl();
         test_socket_bind();
+        test_socket_connect();
 
         puts("*** END OF " TEST_NAME " TEST ***");