X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=src%2Fraw%2Fswift_raw.c;h=27506ac350b5af4dbf4d463323db8b835fc7a682;hb=d8da6fc1273a2acee935a15761b77a73424faef5;hp=441181a764042676d9a3f79fe838c2e6c5de63fe;hpb=09cb77aa9356219c7b6b2f9e5115b1ae4d35496c;p=swifty.git diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c index 441181a..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,93 +19,15 @@ #include #include #include +#include +#include +#include #include "swift_types.h" #include "swift_raw.h" - -/* socket management structure */ -struct sock_list { - int s; - struct sockaddr_sw addr; - 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; - - return ptr; -} - -/* - * Bind socket to given address. Called by sw_bind "syscall". - */ - -static struct sock_list *list_update_socket_address(int s, struct sockaddr_sw *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; -} - -/* - * 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 @@ -114,13 +36,36 @@ 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; + int rc; - s = socket(__domain, SOCK_RAW, IPPROTO_SWIFT); + if (__domain != PF_INET || __type != SOCK_DGRAM || __protocol != IPPROTO_SWIFT) { + errno = EINVAL; + goto sock_err; + } + + s = socket(PF_INET, SOCK_RAW, IPPROTO_SWIFT); + if (s < 0) { + goto sock_err; + } + + rc = sm_add(s); + if (rc < 0) { + errno = ENOMEM; + goto list_add_err; + } + + /* Socket is not bound. */ + sm_mark_unbound(s); return s; + +list_add_err: + close(s); +sock_err: + return -1; } /* @@ -128,20 +73,60 @@ int sw_socket (int __domain, int __type, int __protocol) * * 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) { - /* TODO */ + int rc; + + rc = sm_is_bound(__fd); + if (rc == 1) { + errno = EINVAL; + goto socket_bound_err; + } + + /* Check whether address is already in use. */ + rc = sm_address_exists(__addr); + if (rc == 1) { + errno = EADDRINUSE; + goto address_err; + } + + /* Update __fd entry in socket management list. */ + rc = sm_update_address(__fd, __addr); + if (rc < 0) { + errno = EBADF; + goto update_err; + } + + sm_mark_bound(__fd); return 0; + +update_err: +address_err: +socket_bound_err: + return -1; } /* 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 */ + 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; } /* @@ -151,15 +136,45 @@ 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; + 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; + } + + { + 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 = (void *) __buf; + __iov[0].iov_len = __n; + + /* The message header contains parameters for sendmsg. */ + __msgh.msg_name = (caddr_t) __addr; + __msgh.msg_namelen = sizeof(__addr); + __msgh.msg_iov = __iov; + __msgh.msg_iovlen = 1; + __msgh.msg_control = NULL; /* irrelevant to AF_INET */ + __msgh.msg_controllen = 0; /* irrelevant to AF_INET */ + + return sendmsg(__fd, &__msgh, 0); + +sock_err: + return -1; } /* @@ -171,15 +186,28 @@ 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) { 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; } /* @@ -189,14 +217,14 @@ 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); } /* @@ -206,13 +234,13 @@ 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; /* TODO */ - return bytes_recv; + return recvmsg(__fd, __message, __flags); } /* @@ -220,7 +248,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) { @@ -233,8 +261,7 @@ 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, +int sw_setsockopt(int __fd, int __level, int __optname, __const void *__optval, socklen_t __optlen) { /* Call classical interface of setsockopt(2). */ @@ -242,15 +269,23 @@ int sw_setsockopt (int __fd, int __level, int __optname, } /* - * 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. + * Close file descriptor for socket FD. * Returns 0 on success, -1 for errors. */ -int sw_shutdown (int __fd, int __how) +int sw_close(int __fd) { - /* Call classical interface of shutdown(2). */ - return shutdown(__fd, __how); + int rc; + + /* Remove socket from socket management structure. */ + rc = sm_del(__fd); + if (rc < 0) { + errno = EBADF; + goto del_err; + } + + /* Call classical interface of close(2). */ + return close(__fd); + +del_err: + return -1; }