raw: Merge data.

[swifty.git] / src / raw / swift_raw.c

diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c
index 186731b..1bb2d89 100644 (file)
--- a/src/raw/swift_raw.c
+++ b/src/raw/swift_raw.c
@@ -140,7 +140,7 @@ static struct sock_list *list_unlink_socket(int s)
  *
  * swift: PROTOCOL is IPPROTO_SWIFT. Ignore TYPE.
  */
-int sw_socket (int __domain, int __type, int __protocol)
+int sw_socket(int __domain, int __type, int __protocol)
 {
        int s;
        struct sock_list *list;
@@ -153,6 +153,16 @@ int sw_socket (int __domain, int __type, int __protocol)
        if (list == NULL)
                goto list_add_err;
 
+       /* Socket is fully open. */
+       list->rw_state = STATE_NO_SHUT;
+
+       if (__domain != AF_INET || __type != SOCK_RAW || __protocol != IPPROTO_SWIFT) {
+               errno = EINVAL;
+               return -1;
+       }
+       
+       s = socket(AF_INET, SOCK_RAW, IPPROTO_SWIFT);
+
        return s;
 
 list_add_err:
@@ -166,7 +176,7 @@ sock_err:
  *
  * swift: ADDR is of type struct sockaddr_sw.
  */
-int sw_bind (int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len)
+int sw_bind(int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len)
 {
        struct sock_list *list;
 
@@ -191,7 +201,7 @@ list_elem_err:
 }
 
 /* Put the local address of FD into *ADDR and its length in *LEN.  */
-int sw_getsockname (int __fd, __SOCKADDR_ARG __addr,
+int sw_getsockname(int __fd, __SOCKADDR_ARG __addr,
                        socklen_t *__restrict __len)
 {
        /* TODO */
@@ -206,14 +216,12 @@ int sw_getsockname (int __fd, __SOCKADDR_ARG __addr,
  * This function is a cancellation point and therefore not marked with
  * __THROW.
  */
-ssize_t sw_sendto (int __fd, __const void *__buf, size_t __n,
+ssize_t sw_sendto(int __fd, __const void *__buf, size_t __n,
                       int __flags, __CONST_SOCKADDR_ARG __addr,
                       socklen_t __addr_len)
 {
        ssize_t bytes_sent;
 
-       /* TODO */
-
        return bytes_sent;
 }
 
@@ -226,7 +234,7 @@ ssize_t sw_sendto (int __fd, __const void *__buf, size_t __n,
  * This function is a cancellation point and therefore not marked with
  * __THROW.
  */
-ssize_t sw_recvfrom (int __fd, void *__restrict __buf, size_t __n,
+ssize_t sw_recvfrom(int __fd, void *__restrict __buf, size_t __n,
                         int __flags, __SOCKADDR_ARG __addr,
                         socklen_t *__restrict __addr_len)
 {
@@ -244,14 +252,12 @@ ssize_t sw_recvfrom (int __fd, void *__restrict __buf, size_t __n,
  * This function is a cancellation point and therefore not marked with
  * __THROW.
  */
-ssize_t sw_sendmsg (int __fd, __const struct msghdr *__message,
+ssize_t sw_sendmsg(int __fd, __const struct msghdr *__message,
                        int __flags)
 {
        ssize_t bytes_sent;
 
-       /* TODO */
-
-       return bytes_sent;
+       return sendmsg(__fd, __message, __flags);
 }
 
 /*
@@ -261,7 +267,7 @@ ssize_t sw_sendmsg (int __fd, __const struct msghdr *__message,
  * This function is a cancellation point and therefore not marked with
  * __THROW.
  */
-ssize_t sw_recvmsg (int __fd, struct msghdr *__message, int __flags)
+ssize_t sw_recvmsg(int __fd, struct msghdr *__message, int __flags)
 {
        ssize_t bytes_recv;
 
@@ -275,7 +281,7 @@ ssize_t sw_recvmsg (int __fd, struct msghdr *__message, int __flags)
  * LEVEL into OPTVAL (which is *OPTLEN bytes long), and set *OPTLEN to the
  * value's actual length.  Returns 0 on success, -1 for errors.
  */
-int sw_getsockopt (int __fd, int __level, int __optname,
+int sw_getsockopt(int __fd, int __level, int __optname,
                       void *__restrict __optval,
                       socklen_t *__restrict __optlen)
 {
@@ -289,7 +295,7 @@ int sw_getsockopt (int __fd, int __level, int __optname,
  * Returns 0 on success, -1 for errors.
  */
 
-int sw_setsockopt (int __fd, int __level, int __optname,
+int sw_setsockopt(int __fd, int __level, int __optname,
                       __const void *__optval, socklen_t __optlen)
 {
        /* Call classical interface of setsockopt(2). */
@@ -304,8 +310,73 @@ int sw_setsockopt (int __fd, int __level, int __optname,
  *   SHUT_RDWR = No more receptions or transmissions.
  * Returns 0 on success, -1 for errors.
  */
-int sw_shutdown (int __fd, int __how)
+int sw_shutdown(int __fd, int __how)
 {
+       struct sock_list *list;
+
+       /* Find socket in management structure. */
+       list = list_elem_from_socket(__fd);
+       if (list == NULL) {
+               errno = EBADF;
+               goto list_elem_err;
+       }
+
+       /* Check and update socket state. */
+       if (__how == STATE_SHUT_RDWR)
+               list->rw_state = STATE_SHUT_RDWR;
+       else if (__how == STATE_SHUT_WR) {
+               if (list->rw_state == STATE_SHUT_RD)
+                       list->rw_state = STATE_SHUT_RDWR;
+               else if (list->rw_state == STATE_SHUT_WR) {
+                       errno = ENOTCONN;
+                       goto not_conn_err;
+               }
+       }
+       else if (__how == STATE_SHUT_RD) {
+               if (list->rw_state == STATE_SHUT_WR)
+                       list->rw_state = STATE_SHUT_RDWR;
+               else if (list->rw_state == STATE_SHUT_RD) {
+                       errno = ENOTCONN;
+                       goto not_conn_err;
+               }
+       }
+
+       /* Remove socket from socket management structure. */
+       if (list->rw_state == STATE_SHUT_RDWR) {
+               list = list_unlink_socket(__fd);
+               if (list == NULL) {
+                       errno = EBADF;
+                       goto list_unlink_err;
+               }
+       }
+
        /* Call classical interface of shutdown(2). */
        return shutdown(__fd, __how);
+
+not_conn_err:
+list_elem_err:
+list_unlink_err:
+       return -1;
+}
+
+/*
+ * Close file descriptor for socket FD.
+ * Returns 0 on success, -1 for errors.
+ */
+int sw_close(int __fd)
+{
+       struct sock_list *list;
+
+       /* Remove socket from socket management structure. */
+       list = list_unlink_socket(__fd);
+       if (list == NULL) {
+               errno = EBADF;
+               goto list_unlink_err;
+       }
+
+       /* Call classical interface of close(2). */
+       return close(__fd);
+
+list_unlink_err:
+       return -1;
 }