X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=blobdiff_plain;f=src%2Fraw%2Fswift_raw.c;h=4f2655128ed843820078935851bdede56e73d101;hb=d9939eb8513e26c75f56cd05ccdc0c449e5d9a07;hp=2bb0b51d38f730c5b88145a75fb79af122bcb344;hpb=7ae40fec80a0dd27530963b282e24ec7bd2b7b56;p=swifty.git

diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c
index 2bb0b51..4f26551 100644
--- a/src/raw/swift_raw.c
+++ b/src/raw/swift_raw.c
@@ -22,151 +22,9 @@
 #include <unistd.h>
 #include <errno.h>
 
-#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 "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
@@ -180,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;
 	}
@@ -196,9 +54,6 @@ 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;
 
@@ -285,26 +140,24 @@ ssize_t sw_sendto(int __fd, __const void *__buf, size_t __n,
 	struct sock_list *list;
 	struct iovec __iov[1];
 	struct msghdr __msgh;
-	
+	struct sockaddr_sw *__sw_addr = (struct sockaddr_sw *) __addr;
+
+	printf("=== ADDR: %s ===", ntohl(__sw_addr->sin_addr.s_addr));
 	list = list_elem_from_socket(__fd);
 	if (list == NULL) {
 		errno = EBADF;
 		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) {
+
+ 	if (list->bind_state == STATE_NOTBOUND) {
 		errno = EDESTADDRREQ;
 		goto sock_err;
 	}
- */
+ 
 	
 	/* 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.    */
@@ -390,7 +243,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)
 {
@@ -398,64 +250,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.