X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=src%2Fraw%2Fswift_raw.c;h=27506ac350b5af4dbf4d463323db8b835fc7a682;hb=bf58ee2adc522ea0dbd050d94d3625071eb02d1b;hp=9e943f54e91052862fc71ea9356ad282dd694a52;hpb=6982906832b0ff48047de5e6a19c5affb6337e01;p=swifty.git diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c index 9e943f5..27506ac 100644 --- a/src/raw/swift_raw.c +++ b/src/raw/swift_raw.c @@ -1,5 +1,5 @@ /* - * swift implementation of syscall API> + * swift implementation of syscall API * * Simulates the classic socket syscalls (socket, bind, send, recv). * Implementation uses raw sockets (AF_INET, SOCK_RAW). @@ -19,119 +19,15 @@ #include #include #include +#include #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; -} - -/* - * Remove socket from list. Called by sw_close "syscall". - */ - -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; -} +#include "socket_manager.h" +#include "debug.h" +#include "util.h" /* * Create a new socket of type TYPE in domain DOMAIN, using @@ -143,9 +39,9 @@ static struct sock_list *list_unlink_socket(int s) int sw_socket(int __domain, int __type, int __protocol) { int s; - struct sock_list *list; + int rc; - 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; } @@ -155,14 +51,14 @@ int sw_socket(int __domain, int __type, int __protocol) goto sock_err; } - list = list_add_socket(s); - if (list == NULL) { + rc = sm_add(s); + if (rc < 0) { errno = ENOMEM; goto list_add_err; } - /* Socket is fully open. */ - list->rw_state = STATE_NO_SHUT; + /* Socket is not bound. */ + sm_mark_unbound(s); return s; @@ -179,26 +75,35 @@ sock_err: */ int sw_bind(int __fd, __CONST_SOCKADDR_ARG __addr, socklen_t __len) { - struct sock_list *list; + int rc; + + rc = sm_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); - if (list != NULL) { + rc = sm_address_exists(__addr); + if (rc == 1) { errno = EADDRINUSE; - goto list_elem_err; + goto address_err; } /* Update __fd entry in socket management list. */ - list = list_update_socket_address(__fd, __addr); - if (list == NULL) { + rc = sm_update_address(__fd, __addr); + if (rc < 0) { errno = EBADF; - goto list_update_err; + goto update_err; } + sm_mark_bound(__fd); + return 0; -list_update_err: -list_elem_err: +update_err: +address_err: +socket_bound_err: return -1; } @@ -206,9 +111,22 @@ list_elem_err: int sw_getsockname(int __fd, __SOCKADDR_ARG __addr, socklen_t *__restrict __len) { - /* TODO */ + struct sockaddr *addr; + + /* Find socket in management structure. */ + addr = sm_get_address(__fd); + if (addr == NULL) { + errno = EINVAL; + goto address_err; + } + + memcpy(__addr, &addr, sizeof(addr)); + *__len = sizeof(addr); return 0; + +address_err: + return -1; } /* @@ -223,29 +141,26 @@ ssize_t sw_sendto(int __fd, __const void *__buf, size_t __n, socklen_t __addr_len) { ssize_t bytes_sent; - struct sock_list *list; struct iovec __iov[1]; struct msghdr __msgh; - - list = list_elem_from_socket(__fd); - if (list == NULL) { - errno = EBADF; + struct sockaddr_sw *__sw_addr = (struct sockaddr_sw *) __addr; + int rc; + + rc = sm_is_bound(__fd); + if (rc < 0) { + errno = EAFNOSUPPORT; 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; - goto sock_err; + { + char str[INET_ADDRSTRLEN]; + + inet_ntop(AF_INET, &(__sw_addr->sin_addr), str, INET_ADDRSTRLEN); + printf("=== ADDR: %s ===\n", str); } - */ - + /* 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. */ @@ -276,10 +191,23 @@ ssize_t sw_recvfrom(int __fd, void *__restrict __buf, size_t __n, socklen_t *__restrict __addr_len) { ssize_t bytes_recv; + struct iovec __iov[1]; + struct msghdr __msgh; + struct sockaddr_sw *__sw_addr = (struct sockaddr_sw *) __addr; + int rc; + + rc = sm_is_bound(__fd); + if (rc < 0) { + errno = EAFNOSUPPORT; + goto sock_err; + } /* TODO */ - return bytes_recv; + return recvmsg(__fd, &__msgh, 0); + +sock_err: + return -1; } /* @@ -294,6 +222,8 @@ ssize_t sw_sendmsg(int __fd, __const struct msghdr *__message, { ssize_t bytes_sent; + /* TODO */ + return sendmsg(__fd, __message, __flags); } @@ -310,7 +240,7 @@ ssize_t sw_recvmsg(int __fd, struct msghdr *__message, int __flags) /* TODO */ - return bytes_recv; + return recvmsg(__fd, __message, __flags); } /* @@ -331,7 +261,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) { @@ -339,81 +268,24 @@ 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; - - /* 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; + int rc; /* Remove socket from socket management structure. */ - list = list_unlink_socket(__fd); - if (list == NULL) { + rc = sm_del(__fd); + if (rc < 0) { errno = EBADF; - goto list_unlink_err; + goto del_err; } /* Call classical interface of close(2). */ return close(__fd); -list_unlink_err: +del_err: return -1; }