raw: Extract sock_list in a file

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

diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c
index 84cb382..def68bb 100644 (file)
--- a/src/raw/swift_raw.c
+++ b/src/raw/swift_raw.c
@@ -24,148 +24,7 @@
 
 #include "swift_types.h"
 #include "swift_raw.h"
-
-enum sock_rw_state {
-       STATE_NO_SHUT,
-       STATE_SHUT_RD,
-       STATE_SHUT_WR,
-       STATE_SHUT_RDWR
-};
-
-enum sock_bind_state {
-       STATE_NOTBOUND,
-       STATE_BOUND
-};
-
-/* socket management structure */
-struct sock_list {
-       int s;
-       struct sockaddr_sw addr;
-       enum sock_rw_state rw_state;
-       enum sock_bind_state bind_state;
-       struct sock_list *next;
-       struct sock_list *prev;
-};
-
-static struct sock_list sock_list_head = {
-       .next = &sock_list_head,
-       .prev = &sock_list_head
-};
-
-/*
- * Add new socket to list. Called by sw_socket "syscall".
- */
-
-static struct sock_list *list_add_socket(int s)
-{
-       struct sock_list *ptr = malloc(sizeof(*ptr));
-       if (ptr == NULL)
-               return NULL;
-
-       ptr->next = &sock_list_head;
-       ptr->prev = sock_list_head.prev;
-       sock_list_head.prev->next = ptr;
-       sock_list_head.prev = ptr;
-       ptr->s = s;
-
-       return ptr;
-}
-
-/*
- * Bind socket to given address. Called by sw_bind "syscall".
- */
-
-static struct sock_list *list_update_socket_address(int s, __CONST_SOCKADDR_ARG addr)
-{
-       struct sock_list *ptr;
-
-       for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next)
-               if (ptr->s == s) {
-                       memcpy(&ptr->addr, addr, sizeof(ptr->addr));
-                       return ptr;
-               }
-
-       return NULL;
-}
-
-/*
- * Get list element containing socket s. Called by sw_send* "syscalls".
- */
-
-static struct sock_list *list_elem_from_socket(int s)
-{
-       struct sock_list *ptr;
-
-       for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next)
-               if (ptr->s == s)
-                       return ptr;
-
-       return NULL;
-}
-
-/*
- * Get list element containing address addr. Called by sw_bind "syscall".
- */
-
-static struct sock_list *list_elem_from_address(__CONST_SOCKADDR_ARG addr)
-{
-       struct sock_list *ptr;
-
-       for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next) {
-               if (ptr->bind_state == STATE_NOTBOUND)
-                       continue;
-               if (memcmp(&ptr->addr, addr, sizeof(addr)) == 0)
-                       return ptr;
-       }
-
-       return NULL;
-}
-
-static struct sock_list *list_unlink_socket(int s)
-{
-       struct sock_list *ptr;
-
-       for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next)
-               if (ptr->s == s) {
-                       ptr->next->prev = ptr->prev;
-                       ptr->prev->next = ptr->next;
-                       ptr->next = ptr;
-                       ptr->prev = ptr;
-                       return ptr;
-               }
-
-       return NULL;
-}
-
-/*
- * Remove socket from list. Called by sw_close "syscall".
- */
-
-static int list_remove_socket(int s)
-{
-       struct sock_list *ptr;
-
-       ptr = list_unlink_socket(s);
-       if (ptr == NULL)
-               return -1;
-
-       free(ptr);
-       return 0;
-}
-
-static int list_socket_is_bound(int s)
-{
-       struct sock_list *ptr;
-
-       for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next)
-               if (ptr->s == s) {
-                       if (ptr->bind_state == STATE_BOUND)
-                               return 1;
-                       break;
-               }
-
-       return 0;
-}
+#include "swift_list.h"
 
 /*
  * Create a new socket of type TYPE in domain DOMAIN, using
@@ -179,7 +38,7 @@ int sw_socket(int __domain, int __type, int __protocol)
        int s;
        struct sock_list *list;
 
-       if (__domain != PF_INET || __type != SOCK_RAW || __protocol != IPPROTO_SWIFT) {
+       if (__domain != PF_INET || __type != SOCK_DGRAM || __protocol != IPPROTO_SWIFT) {
                errno = EINVAL;
                goto sock_err;
        }