X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=src%2Fraw%2Fswift_raw.c;h=b2d96e0f229ab63304e6c296e44f19b8047b88ce;hb=d8b578221c2712bd82635532f56d9ae9cafb3cfd;hp=cc1109afe6e9e31e59a95c5e5f907198e39b9032;hpb=d0689e2518820aed3edc27ef71e54acaec2534c1;p=swifty.git diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c index cc1109a..b2d96e0 100644 --- a/src/raw/swift_raw.c +++ b/src/raw/swift_raw.c @@ -22,129 +22,9 @@ #include #include -#include "swift_types.h" -#include "swift_raw.h" - -enum sock_rw_state { - STATE_NO_SHUT, - STATE_SHUT_RD, - STATE_SHUT_WR, - STATE_SHUT_RDWR -}; - -/* socket management structure */ -struct sock_list { - int s; - struct sockaddr_sw addr; - enum sock_rw_state rw_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 (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; -} - +#include "include/swift_types.h" +#include "include/swift_raw.h" +#include "include/swift_list.h" /* * Create a new socket of type TYPE in domain DOMAIN, using @@ -158,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; } @@ -174,8 +54,8 @@ int sw_socket(int __domain, int __type, int __protocol) goto list_add_err; } - /* Socket is fully open. */ - list->rw_state = STATE_NO_SHUT; + /* Socket is not bound. */ + list->bind_state = STATE_NOTBOUND; return s; @@ -193,6 +73,13 @@ sock_err: int sw_bind(int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) { struct sock_list *list; + int rc; + + rc = list_socket_is_bound(__fd); + if (rc == 1) { + errno = EINVAL; + goto socket_bound_err; + } /* Check whether address is already in use. */ list = list_elem_from_address(__addr); @@ -210,6 +97,7 @@ int sw_bind(int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) return 0; +socket_bound_err: list_update_err: list_elem_err: return -1; @@ -259,10 +147,6 @@ ssize_t sw_sendto(int __fd, __const void *__buf, size_t __n, goto sock_err; } - if (list->rw_state == STATE_SHUT_WR || list->rw_state == STATE_SHUT_RDWR) { - errno = ENOTCONN; - goto sock_err; - } /* if (list->state == STATE_NOBOUND) { errno = EDESTADDRREQ; @@ -271,7 +155,7 @@ ssize_t sw_sendto(int __fd, __const void *__buf, size_t __n, */ /* Specify the components of the message in an "iovec". */ - __iov[0].iov_base = __buf; + __iov[0].iov_base = (void *) __buf; __iov[0].iov_len = __n; /* The message header contains parameters for sendmsg. */ @@ -357,7 +241,6 @@ int sw_getsockopt(int __fd, int __level, int __optname, * to *OPTVAL (which is OPTLEN bytes long). * Returns 0 on success, -1 for errors. */ - int sw_setsockopt(int __fd, int __level, int __optname, __const void *__optval, socklen_t __optlen) { @@ -365,64 +248,6 @@ int sw_setsockopt(int __fd, int __level, int __optname, return setsockopt(__fd, __level, __optname, __optval, __optlen); } -/* - * Shut down all or part of the connection open on socket FD. - * HOW determines what to shut down: - * SHUT_RD = No more receptions; - * SHUT_WR = No more transmissions; - * SHUT_RDWR = No more receptions or transmissions. - * Returns 0 on success, -1 for errors. - */ -int sw_shutdown(int __fd, int __how) -{ - struct sock_list *list; - int rc; - - /* 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) { - rc = list_remove_socket(__fd); - if (rc < 0) { - 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.