From 76638172720096c39365eac22ad9437d81f65557 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 12:28:41 +0300 Subject: [PATCH 01/16] Fill tests for bind. --- src/raw/test/test_sw_bind.c | 117 +++++++++++++++++++++++++++++++++++- 1 file changed, 116 insertions(+), 1 deletion(-) diff --git a/src/raw/test/test_sw_bind.c b/src/raw/test/test_sw_bind.c index c9d986c..795a851 100644 --- a/src/raw/test/test_sw_bind.c +++ b/src/raw/test/test_sw_bind.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include "swift_raw.h" @@ -24,17 +25,131 @@ static void bind_dummy(void); static void bind_invalid_descriptor(void); static void bind_descriptor_not_a_socket(void); static void bind_invalid_ip_address(void); +static void bind_ok(void); static void bind_address_in_use(void); static void bind_socket_already_bound(void); -static void bind_ok(void); void bind_test_suite(void) { start_suite(); bind_dummy(); + bind_invalid_descriptor(); + bind_descriptor_not_a_socket(); + bind_invalid_ip_address(); + bind_ok(); + bind_address_in_use(); + bind_socket_already_bound(); } static void bind_dummy(void) { test(1 == 1); } + +static void bind_invalid_descriptor(void) +{ + struct sockaddr_sw addr; + int rc; + + rc = sw_bind(-2, (struct sockaddr *) &addr, sizeof(addr)); + + test(rc < 0 && errno == EBADF); +} + +static void bind_descriptor_not_a_socket(void) +{ + struct sockaddr_sw addr; + int fd = dup(STDOUT_FILENO); + int rc; + + rc = sw_bind(fd, (struct sockaddr *) &addr, sizeof(addr)); + + /* + * We are unable to properly handle checking whether the file + * descriptor is a socket in the raw socket based implementation. + * To be updated when porting to the kernel. + */ + test(rc < 0 && errno == ENOTSOCK); +} + +static void bind_invalid_ip_address(void) +{ + struct sockaddr_sw addr; + int sockfd; + int rc; + + sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); + memset(&addr, 0, sizeof(addr)); + inet_pton(AF_INET, "254.254.254.254", &addr.sin_addr.s_addr); + rc = sw_bind(sockfd, (struct sockaddr *) &addr, sizeof(addr)); + + /* + * We are unable to properly handle address validation in the raw + * socket based implementation. + * To be updated when porting to the kernel. + */ + test(rc < 0 && errno == EADDRNOTAVAIL); + + sw_close(sockfd); +} + +static void bind_ok(void) +{ + struct sockaddr_sw addr; + int sockfd; + int rc; + + sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); + memset(&addr, 0, sizeof(addr)); + addr.sin_addr.s_addr = INADDR_ANY; + rc = sw_bind(sockfd, (struct sockaddr *) &addr, sizeof(addr)); + + test(rc == 0); + + sw_close(sockfd); +} + +static void bind_address_in_use(void) +{ + struct sockaddr_sw addr1, addr2; + int sockfd1, sockfd2; + int rc; + + sockfd1 = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); + memset(&addr1, 0, sizeof(addr1)); + addr1.sin_addr.s_addr = INADDR_ANY; + rc = sw_bind(sockfd1, (struct sockaddr *) &addr1, sizeof(addr1)); + dprintf("after first sw_bind rc = %d\n", rc); + + sockfd2 = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); + memset(&addr2, 0, sizeof(addr2)); + addr2.sin_addr.s_addr = INADDR_ANY; + rc = sw_bind(sockfd2, (struct sockaddr *) &addr2, sizeof(addr2)); + dprintf("after second sw_bind rc = %d\n", rc); + + test(rc < 0 && errno == EADDRINUSE); + + sw_close(sockfd1); + sw_close(sockfd2); +} + +static void bind_socket_already_bound(void) +{ + struct sockaddr_sw addr1, addr2; + int sockfd; + int rc; + + sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); + memset(&addr1, 0, sizeof(addr1)); + addr1.sin_addr.s_addr = INADDR_ANY; + rc = sw_bind(sockfd, (struct sockaddr *) &addr1, sizeof(addr1)); + + memset(&addr2, 0, sizeof(addr2)); + addr2.sin_addr.s_addr = INADDR_ANY; + addr2.sw_hash.h_array[0] = 0xFF; /* chage hash ("port") */ + rc = sw_bind(sockfd, (struct sockaddr *) &addr2, sizeof(addr2)); + + test(rc < 0 && errno == EINVAL); + + sw_close(sockfd); +} -- 2.20.1 From d4977183ceadd67f4cab740e6bd38e26ad80fe93 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 12:36:47 +0300 Subject: [PATCH 02/16] Proper header inclusion. Replace #include "include/xxx.h" with #include "xxx.h" and update Makefile accordingly. --- src/raw/Makefile | 2 +- src/raw/swift_list.c | 5 +++-- src/raw/swift_raw.c | 8 +++++--- src/raw/swift_raw_simple_test.c | 7 ++++--- src/raw/test/Makefile | 6 ++++++ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/raw/Makefile b/src/raw/Makefile index a183280..ebe30f3 100644 --- a/src/raw/Makefile +++ b/src/raw/Makefile @@ -1,4 +1,4 @@ -CPPFLAGS = -DDEBUG -DLOG_LEVEL=LOG_DEBUG -I. -I.. -I../include +CPPFLAGS = -DDEBUG -DLOG_LEVEL=LOG_DEBUG -I. -I.. -Iinclude #CPPFLAGS = -I. -Iinclude CFLAGS = -Wall -g diff --git a/src/raw/swift_list.c b/src/raw/swift_list.c index 786c6fc..c2b5abe 100644 --- a/src/raw/swift_list.c +++ b/src/raw/swift_list.c @@ -22,9 +22,10 @@ #include #include -#include "include/swift_types.h" -#include "include/swift_list.h" +#include "swift_types.h" +#include "swift_list.h" #include "debug.h" +#include "util.h" /* * Add new socket to list. Called by sw_socket "syscall". diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c index a8f55ad..b7eb04a 100644 --- a/src/raw/swift_raw.c +++ b/src/raw/swift_raw.c @@ -22,9 +22,11 @@ #include #include -#include "include/swift_types.h" -#include "include/swift_raw.h" -#include "include/swift_list.h" +#include "swift_types.h" +#include "swift_raw.h" +#include "swift_list.h" +#include "debug.h" +#include "util.h" /* * Create a new socket of type TYPE in domain DOMAIN, using diff --git a/src/raw/swift_raw_simple_test.c b/src/raw/swift_raw_simple_test.c index 97b24ef..a3dae44 100644 --- a/src/raw/swift_raw_simple_test.c +++ b/src/raw/swift_raw_simple_test.c @@ -9,9 +9,10 @@ #include #include -#include "include/swift_types.h" -#include "include/swift_raw.h" -#include "include/util.h" +#include "swift_types.h" +#include "swift_raw.h" +#include "debug.h" +#include "util.h" /* * Create a socket, bind it and send data. diff --git a/src/raw/test/Makefile b/src/raw/test/Makefile index fba469b..0ea2f98 100644 --- a/src/raw/test/Makefile +++ b/src/raw/test/Makefile @@ -13,6 +13,12 @@ test: test.o test_sw_socket.o test_sw_bind.o test_sw_getsockname.o \ test_sw_close.o test_dummy.o test_common.o \ ../swift_raw.o ../swift_list.o +../swift_raw.o: ../swift_raw.c ../include/swift_raw.h + make -C .. swift_raw.o + +../swift_list.o: ../swift_list.c ../include/swift_list.h + make -C .. swift_list.o + clean: -rm -f *~ *.o -rm -f test -- 2.20.1 From 52fb2e30cd76ebbc79743609ac9d73ce9a86c8c3 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 12:47:14 +0300 Subject: [PATCH 03/16] raw: Use inet_ntop/inet_ntop for IP address conversions. --- src/raw/swift_raw.c | 1 + src/raw/swift_raw_simple_test.c | 20 +++++++++----------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c index b7eb04a..03170e4 100644 --- a/src/raw/swift_raw.c +++ b/src/raw/swift_raw.c @@ -19,6 +19,7 @@ #include #include #include +#include #include #include diff --git a/src/raw/swift_raw_simple_test.c b/src/raw/swift_raw_simple_test.c index a3dae44..73fc344 100644 --- a/src/raw/swift_raw_simple_test.c +++ b/src/raw/swift_raw_simple_test.c @@ -8,6 +8,7 @@ #include #include #include +#include #include "swift_types.h" #include "swift_raw.h" @@ -26,27 +27,24 @@ int main(int argc, char *argv[]) ssize_t bytes_sent; int rc; - if (argc < 3) - { + if (argc < 3 || argc > 4) { fprintf(stderr,"Usage \"./client ip_local hash ip_dest?\" ."); + exit(EXIT_FAILURE); } sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); DIE(sockfd < 0, "sw_socket"); - /* TODO: init_addr */ - local_addr.sin_addr.s_addr = htonl(argv[1]); + memset(&local_addr, 0, sizeof(local_addr)); + inet_pton(AF_INET, argv[1], &local_addr.sin_addr.s_addr); memcpy(&local_addr.sw_hash, argv[2], sizeof(struct sw_hash)); rc = sw_bind(sockfd, (struct sockaddr *) &local_addr, sizeof(local_addr)); DIE(rc < 0, "sw_bind"); - /* TODO: init remote_addr */ - if (argv > 3) - { - remote_addr.sin_addr.s_addr = htonl(argv[1]); - memcpy(&remote_addr.sw_hash, argv[3], sizeof(struct sw_hash)); - bytes_sent = sw_sendto(sockfd, buffer, BUFSIZ, 0, - (struct sockaddr *) &remote_addr, sizeof(remote_addr)); + if (argc > 3) { + inet_pton(AF_INET, argv[3], &remote_addr.sin_addr.s_addr); + memcpy(&remote_addr.sw_hash, argv[4], sizeof(struct sw_hash)); + bytes_sent = sw_sendto(sockfd, buffer, BUFSIZ, 0, (struct sockaddr *) &remote_addr, sizeof(remote_addr)); DIE(bytes_sent < 0, "sw_sendto"); } -- 2.20.1 From c4fb580616f7966d283b3adcb7f51c51034aa6ce Mon Sep 17 00:00:00 2001 From: Cornel Mercan Date: Sat, 4 Jun 2011 04:34:43 -0700 Subject: [PATCH 04/16] Implemented swift_connect function --- src/kernel/swift.c | 80 +++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 72 insertions(+), 8 deletions(-) diff --git a/src/kernel/swift.c b/src/kernel/swift.c index 80059f7..e32d657 100644 --- a/src/kernel/swift.c +++ b/src/kernel/swift.c @@ -15,7 +15,6 @@ struct swift_sock { /* swift socket speciffic data */ __be16 src; __be16 dst; - __be16 len; }; static struct swift_sock * sock_port_map[MAX_SWIFT_PORT]; @@ -129,8 +128,70 @@ out: static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_len, int flags) { + int err; + struct sock * sk; + struct inet_sock * isk; + struct swift_sock * ssk; + printk(KERN_DEBUG "swift_connect\n"); + + err = -EINVAL; + if (sock == NULL) { + printk(KERN_ERR "Sock is NULL\n"); + goto out; + } + sk = sock->sk; + + err = -EINVAL; + if (sk == NULL) { + printk(KERN_ERR "Sock->sk is NULL\n"); + goto out; + } + + isk = inet_sk(sk); + ssk = swift_sk(sk); + + if (ssk->src != 0) { + printk(KERN_ERR "ssk->src is not NULL\n"); + goto out; + } + + err = -EINVAL; + if (addr) { + struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) addr; + + err = -EINVAL; + if (addr_len < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) { + printk(KERN_ERR "Invalid size or address family\n"); + goto out; + } + ssk->dst = ntohs(swift_addr->sin_port); + if (ssk->dst == 0 || ssk->dst >= MAX_SWIFT_PORT) { + printk(KERN_ERR "Invalid value for destination port(%u)\n", ssk->dst); + goto out; + } + + isk->inet_daddr = swift_addr->sin_addr.s_addr; + printk(KERN_DEBUG "Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr); + } else { + printk(KERN_ERR "Invalid swift_addr (NULL)\n"); + goto out; + } + + err = -ENOMEM; + ssk->src = get_next_free_port(); + if (ssk->src == 0) { + printk(KERN_ERR "No free ports\n"); + goto out; + } + + swift_hash(ssk->src, ssk); + return 0; + +out: + return err; + } static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len) @@ -161,16 +222,19 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr goto out; } - err = -ENOMEM; - sport = get_next_free_port(); - if (sport == 0) { - printk(KERN_ERR "No free ports\n"); - goto out; - } - isk = inet_sk(sk); ssk = swift_sk(sk); + sport = ssk->src; + if (sport == 0) { + err = -ENOMEM; + sport = get_next_free_port(); + if (sport == 0) { + printk(KERN_ERR "No free ports\n"); + goto out; + } + } + if (msg->msg_name) { struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) msg->msg_name; -- 2.20.1 From 035781747487d5d0724fd8a5a53fe953494112bd Mon Sep 17 00:00:00 2001 From: Adrian Bondrescu Date: Sat, 4 Jun 2011 15:29:23 +0300 Subject: [PATCH 05/16] Improved logging mechanism --- src/kernel/debug.h | 16 ++++++++ src/kernel/swift.c | 97 +++++++++++++++++++++++----------------------- 2 files changed, 65 insertions(+), 48 deletions(-) create mode 100644 src/kernel/debug.h diff --git a/src/kernel/debug.h b/src/kernel/debug.h new file mode 100644 index 0000000..ae4d31a --- /dev/null +++ b/src/kernel/debug.h @@ -0,0 +1,16 @@ +#ifndef _SWIFT_DEBUG_H +#define _SWIFT_DEBUG_H + +#define log_error(...) printk(KERN_ERR "SWIF-ERROR : " __VA_ARGS__) + +#if 1 + +#define log_debug(...) printk(KERN_DEBUG "SWIF-DEBUG : " __VA_ARGS__) + +#else + +#define log_debug(...) + +#endif + +#endif diff --git a/src/kernel/swift.c b/src/kernel/swift.c index e32d657..5ac64ed 100644 --- a/src/kernel/swift.c +++ b/src/kernel/swift.c @@ -5,6 +5,7 @@ #include #include "swift.h" +#include "debug.h" MODULE_DESCRIPTION("Swift Transport Protocol"); MODULE_AUTHOR("Adrian Bondrescu/Cornel Mercan"); @@ -72,7 +73,7 @@ static int swift_release(struct socket *sock) skb_queue_purge(&sk->sk_receive_queue); - printk(KERN_DEBUG "swift_release sock=%p\n", sk); + log_debug("swift_release sock=%p\n", sk); sock_put(sk); return 0; @@ -87,7 +88,7 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) err = -EINVAL; if (addr_len < sizeof(struct sockaddr_swift)) { - printk(KERN_ERR "Invalid size for sockaddr\n"); + log_error("Invalid size for sockaddr\n"); goto out; } @@ -95,7 +96,7 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) err = -EINVAL; if (swift_addr->sin_family != AF_INET) { - printk(KERN_ERR "Invalid family for sockaddr\n"); + log_error("Invalid family for sockaddr\n"); goto out; } @@ -103,13 +104,13 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) err = -EINVAL; if (port == 0 || port >= MAX_SWIFT_PORT) { - printk(KERN_ERR "Invalid value for sockaddr port (%u)\n", port); + log_error("Invalid value for sockaddr port (%u)\n", port); goto out; } err = -EADDRINUSE; if (swift_lookup(port) != NULL) { - printk(KERN_ERR "Port %u already in use\n", port); + log_error("Port %u already in use\n", port); goto out; } @@ -118,7 +119,7 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) swift_hash(port, ssk); - printk(KERN_DEBUG "Socket %p bound to port %u\n", ssk, port); + log_debug("Socket %p bound to port %u\n", ssk, port); return 0; @@ -133,18 +134,18 @@ static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le struct inet_sock * isk; struct swift_sock * ssk; - printk(KERN_DEBUG "swift_connect\n"); + log_debug("swift_connect\n"); err = -EINVAL; if (sock == NULL) { - printk(KERN_ERR "Sock is NULL\n"); + log_error("Sock is NULL\n"); goto out; } sk = sock->sk; err = -EINVAL; if (sk == NULL) { - printk(KERN_ERR "Sock->sk is NULL\n"); + log_error("Sock->sk is NULL\n"); goto out; } @@ -152,7 +153,7 @@ static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le ssk = swift_sk(sk); if (ssk->src != 0) { - printk(KERN_ERR "ssk->src is not NULL\n"); + log_error("ssk->src is not NULL\n"); goto out; } @@ -162,26 +163,26 @@ static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le err = -EINVAL; if (addr_len < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) { - printk(KERN_ERR "Invalid size or address family\n"); + log_error("Invalid size or address family\n"); goto out; } ssk->dst = ntohs(swift_addr->sin_port); if (ssk->dst == 0 || ssk->dst >= MAX_SWIFT_PORT) { - printk(KERN_ERR "Invalid value for destination port(%u)\n", ssk->dst); + log_error("Invalid value for destination port(%u)\n", ssk->dst); goto out; } isk->inet_daddr = swift_addr->sin_addr.s_addr; - printk(KERN_DEBUG "Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr); + log_debug("Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr); } else { - printk(KERN_ERR "Invalid swift_addr (NULL)\n"); + log_error("Invalid swift_addr (NULL)\n"); goto out; } err = -ENOMEM; ssk->src = get_next_free_port(); if (ssk->src == 0) { - printk(KERN_ERR "No free ports\n"); + log_error("No free ports\n"); goto out; } @@ -211,14 +212,14 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr err = -EINVAL; if (sock == NULL) { - printk(KERN_ERR "Sock is NULL\n"); + log_error("Sock is NULL\n"); goto out; } sk = sock->sk; err = -EINVAL; if (sk == NULL) { - printk(KERN_ERR "Sock->sk is NULL\n"); + log_error("Sock->sk is NULL\n"); goto out; } @@ -230,7 +231,7 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr err = -ENOMEM; sport = get_next_free_port(); if (sport == 0) { - printk(KERN_ERR "No free ports\n"); + log_error("No free ports\n"); goto out; } } @@ -240,59 +241,59 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr err = -EINVAL; if (msg->msg_namelen < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) { - printk(KERN_ERR "Invalid size or address family\n"); + log_error("Invalid size or address family\n"); goto out; } dport = ntohs(swift_addr->sin_port); if (dport == 0 || dport >= MAX_SWIFT_PORT) { - printk(KERN_ERR "Invalid value for destination port(%u)\n", dport); + log_error("Invalid value for destination port(%u)\n", dport); goto out; } daddr = swift_addr->sin_addr.s_addr; - printk(KERN_DEBUG "Received from user space destination port=%u and address=%u\n", dport, daddr); + log_debug("Received from user space destination port=%u and address=%u\n", dport, daddr); } else { err = -EDESTADDRREQ; if (!ssk->dst || !isk->inet_daddr) { - printk(KERN_ERR "No destination port/address\n"); + log_error("No destination port/address\n"); goto out; } dport = ssk->dst; daddr = isk->inet_daddr; - printk(KERN_DEBUG "Got from socket destination port=%u and address=%u\n", dport, daddr); + log_debug("Got from socket destination port=%u and address=%u\n", dport, daddr); connected = 1; } totlen = len + sizeof(struct swifthdr) + sizeof(struct iphdr); skb = sock_alloc_send_skb(sk, totlen, msg->msg_flags & MSG_DONTWAIT, &err); if (!skb) { - printk(KERN_ERR "sock_alloc_send_skb failed\n"); + log_error("sock_alloc_send_skb failed\n"); goto out; } - printk(KERN_DEBUG "Allocated %u bytes for skb (payload size=%u)\n", totlen, len); + log_debug("Allocated %u bytes for skb (payload size=%u)\n", totlen, len); skb_reset_network_header(skb); skb_reserve(skb, sizeof(struct iphdr)); - printk(KERN_DEBUG "Reseted network header\n"); + log_debug("Reseted network header\n"); skb_reset_transport_header(skb); skb_put(skb, sizeof(struct swifthdr)); - printk(KERN_DEBUG "Reseted transport header\n"); + log_debug("Reseted transport header\n"); shdr = (struct swifthdr *) skb_transport_header(skb); shdr->dst = ntohs(dport); shdr->src = ntohs(sport); shdr->len = ntohs(len + sizeof(struct swifthdr)); - printk(KERN_DEBUG "payload=%p\n", skb_put(skb, len)); + log_debug("payload=%p\n", skb_put(skb, len)); err = skb_copy_datagram_from_iovec(skb, sizeof(struct swifthdr), msg->msg_iov, 0, len); if (err) { - printk(KERN_ERR "skb_copy_datagram_from_iovec failed\n"); + log_error("skb_copy_datagram_from_iovec failed\n"); goto out_free; } - printk(KERN_DEBUG "Copied %u bytes into the skb\n", len); + log_debug("Copied %u bytes into the skb\n", len); if (connected) rt = (struct rtable *) __sk_dst_check(sk, 0); @@ -304,7 +305,7 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr }; err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0); if (err) { - printk(KERN_ERR "Route lookup failed\n"); + log_error("Route lookup failed\n"); goto out_free; } sk_dst_set(sk, dst_clone(&rt->dst)); @@ -312,9 +313,9 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr err = ip_queue_xmit(skb); if (!err) - printk(KERN_DEBUG "Sent %u bytes on wire\n", len); + log_debug("Sent %u bytes on wire\n", len); else - printk(KERN_ERR "ip_queue_xmit failed\n"); + log_error("ip_queue_xmit failed\n"); return err; @@ -334,11 +335,11 @@ static int swift_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err); if (!skb) { - printk(KERN_ERR "skb_recv_datagram\n"); + log_error("skb_recv_datagram\n"); goto out; } - printk(KERN_DEBUG "Received skb %p\n", skb); + log_debug("Received skb %p\n", skb); swift_addr = (struct sockaddr_swift *) skb->cb; msg->msg_namelen = sizeof(struct sockaddr_swift); @@ -351,7 +352,7 @@ static int swift_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); if (err) { - printk(KERN_ERR "skb_copy_datagram_iovec\n"); + log_error("skb_copy_datagram_iovec\n"); goto out_free; } @@ -379,7 +380,7 @@ static int swift_rcv(struct sk_buff *skb) int err; if (!pskb_may_pull(skb, sizeof(struct swifthdr))) { - printk(KERN_ERR "Insufficient space for header\n"); + log_error("Insufficient space for header\n"); goto drop; } @@ -387,19 +388,19 @@ static int swift_rcv(struct sk_buff *skb) len = ntohs(shdr->len); if (skb->len < len) { - printk(KERN_ERR "Malformed packet (packet_len=%u, skb_len=%u)\n", len, skb->len); + log_error("Malformed packet (packet_len=%u, skb_len=%u)\n", len, skb->len); goto drop; } if (len < sizeof(struct swifthdr)) { - printk(KERN_ERR "Malformed packet (packet_len=%u sizeof(swifthdr)=%u\n", len, sizeof(struct swifthdr)); + log_error("Malformed packet (packet_len=%u sizeof(swifthdr)=%u\n", len, sizeof(struct swifthdr)); goto drop; } src = ntohs(shdr->src); dst = ntohs(shdr->dst); if (src == 0 || dst == 0 || src >= MAX_SWIFT_PORT || dst >= MAX_SWIFT_PORT) { - printk(KERN_ERR "Malformed packet (src=%u, dst=%u)\n", shdr->src, shdr->dst); + log_error("Malformed packet (src=%u, dst=%u)\n", shdr->src, shdr->dst); goto drop; } @@ -408,11 +409,11 @@ static int swift_rcv(struct sk_buff *skb) pskb_trim(skb, len); - printk(KERN_DEBUG "Received %u bytes from from port=%u to port=%u\n", len - sizeof(struct swifthdr), src, dst); + log_debug("Received %u bytes from from port=%u to port=%u\n", len - sizeof(struct swifthdr), src, dst); ssk = swift_lookup(dst); if (ssk == NULL) { - printk(KERN_ERR "Swift lookup failed for port %u\n", dst); + log_error("Swift lookup failed for port %u\n", dst); goto drop; } @@ -423,11 +424,11 @@ static int swift_rcv(struct sk_buff *skb) swift_addr->sin_port = shdr->src; swift_addr->sin_addr.s_addr = ip_hdr(skb)->saddr; - printk(KERN_DEBUG "Setting sin_port=%u, sin_addr=%u\n", ntohs(shdr->src), swift_addr->sin_addr.s_addr); + log_debug("Setting sin_port=%u, sin_addr=%u\n", ntohs(shdr->src), swift_addr->sin_addr.s_addr); err = ip_queue_rcv_skb((struct sock *) &ssk->sock, skb); if (err) { - printk(KERN_ERR "ip_queu_rcv_skb\n"); + log_error("ip_queu_rcv_skb\n"); consume_skb(skb); } return NET_RX_SUCCESS; @@ -484,18 +485,18 @@ static int __init swift_init(void) rc = proto_register(&swift_prot, 1); if (rc) { - printk(KERN_ERR "Error registering swift protocol\n"); + log_error("Error registering swift protocol\n"); goto out; } rc = inet_add_protocol(&swift_protocol, IPPROTO_SWIFT); if (rc) { - printk(KERN_ERR "Error adding swift protocol\n"); + log_error("Error adding swift protocol\n"); goto out_unregister; } inet_register_protosw(&swift_protosw); - printk(KERN_DEBUG "Swift entered\n"); + log_debug("Swift entered\n"); return 0; @@ -514,7 +515,7 @@ static void __exit swift_exit(void) proto_unregister(&swift_prot); - printk(KERN_DEBUG "Swift exited\n"); + log_debug("Swift exited\n"); } module_init(swift_init); -- 2.20.1 From dd44b191bf9b46515dcbd11f06547d53d2d3c40e Mon Sep 17 00:00:00 2001 From: Adrian Bondrescu Date: Sat, 4 Jun 2011 15:44:50 +0300 Subject: [PATCH 06/16] Added likely/unlikely logic --- src/kernel/swift.c | 98 +++++++++++++++++++++++----------------------- 1 file changed, 50 insertions(+), 48 deletions(-) diff --git a/src/kernel/swift.c b/src/kernel/swift.c index 5ac64ed..c54567f 100644 --- a/src/kernel/swift.c +++ b/src/kernel/swift.c @@ -59,7 +59,7 @@ static int swift_release(struct socket *sock) struct sock *sk = sock->sk; struct swift_sock * ssk = swift_sk(sk); - if (!sk) + if (unlikely(!sk)) return 0; swift_unhash(ssk->src); @@ -86,31 +86,31 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) int err; __be16 port; - err = -EINVAL; - if (addr_len < sizeof(struct sockaddr_swift)) { + if (unlikely(addr_len < sizeof(struct sockaddr_swift))) { log_error("Invalid size for sockaddr\n"); + err = -EINVAL; goto out; } swift_addr = (struct sockaddr_swift *) addr; - err = -EINVAL; - if (swift_addr->sin_family != AF_INET) { + if (unlikely(swift_addr->sin_family != AF_INET)) { log_error("Invalid family for sockaddr\n"); + err = -EINVAL; goto out; } port = ntohs(swift_addr->sin_port); - err = -EINVAL; - if (port == 0 || port >= MAX_SWIFT_PORT) { + if (unlikely(port == 0 || port >= MAX_SWIFT_PORT)) { log_error("Invalid value for sockaddr port (%u)\n", port); + err = -EINVAL; goto out; } - err = -EADDRINUSE; - if (swift_lookup(port) != NULL) { + if (unlikely(swift_lookup(port) != NULL)) { log_error("Port %u already in use\n", port); + err = -EADDRINUSE; goto out; } @@ -124,7 +124,7 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) return 0; out: - return -EINVAL; + return err; } static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_len, int flags) @@ -136,39 +136,40 @@ static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le log_debug("swift_connect\n"); - err = -EINVAL; - if (sock == NULL) { + if (unlikely(sock == NULL)) { log_error("Sock is NULL\n"); + err = -EINVAL; goto out; } sk = sock->sk; - err = -EINVAL; - if (sk == NULL) { + if (unlikely(sk == NULL)) { log_error("Sock->sk is NULL\n"); + err = -EINVAL; goto out; } - + isk = inet_sk(sk); ssk = swift_sk(sk); - if (ssk->src != 0) { + if (unlikely(ssk->src != 0)) { log_error("ssk->src is not NULL\n"); + err = -EINVAL; goto out; } - err = -EINVAL; - if (addr) { + if (likely(addr)) { struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) addr; - err = -EINVAL; - if (addr_len < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) { + if (unlikely(addr_len < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET)) { log_error("Invalid size or address family\n"); + err = -EINVAL; goto out; } ssk->dst = ntohs(swift_addr->sin_port); - if (ssk->dst == 0 || ssk->dst >= MAX_SWIFT_PORT) { + if (unlikely(ssk->dst == 0 || ssk->dst >= MAX_SWIFT_PORT)) { log_error("Invalid value for destination port(%u)\n", ssk->dst); + err = -EINVAL; goto out; } @@ -176,13 +177,14 @@ static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le log_debug("Received from user space destination port=%u and address=%u\n", ssk->dst, isk->inet_daddr); } else { log_error("Invalid swift_addr (NULL)\n"); + err = -EINVAL; goto out; } - err = -ENOMEM; ssk->src = get_next_free_port(); - if (ssk->src == 0) { + if (unlikely(ssk->src == 0)) { log_error("No free ports\n"); + err = -ENOMEM; goto out; } @@ -192,7 +194,6 @@ static int swift_connect(struct socket *sock, struct sockaddr *addr, int addr_le out: return err; - } static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len) @@ -210,16 +211,16 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr int totlen; struct rtable * rt = NULL; - err = -EINVAL; - if (sock == NULL) { + if (unlikely(sock == NULL)) { log_error("Sock is NULL\n"); + err = -EINVAL; goto out; } sk = sock->sk; - err = -EINVAL; - if (sk == NULL) { + if (unlikely(sk == NULL)) { log_error("Sock->sk is NULL\n"); + err = -EINVAL; goto out; } @@ -228,10 +229,10 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr sport = ssk->src; if (sport == 0) { - err = -ENOMEM; sport = get_next_free_port(); - if (sport == 0) { + if (unlikely(sport == 0)) { log_error("No free ports\n"); + err = -ENOMEM; goto out; } } @@ -239,24 +240,25 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr if (msg->msg_name) { struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) msg->msg_name; - err = -EINVAL; - if (msg->msg_namelen < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET) { + if (unlikely(msg->msg_namelen < sizeof(*swift_addr) || swift_addr->sin_family != AF_INET)) { log_error("Invalid size or address family\n"); + err = -EINVAL; goto out; } dport = ntohs(swift_addr->sin_port); - if (dport == 0 || dport >= MAX_SWIFT_PORT) { + if (unlikely(dport == 0 || dport >= MAX_SWIFT_PORT)) { log_error("Invalid value for destination port(%u)\n", dport); + err = -EINVAL; goto out; } daddr = swift_addr->sin_addr.s_addr; log_debug("Received from user space destination port=%u and address=%u\n", dport, daddr); } else { - err = -EDESTADDRREQ; - if (!ssk->dst || !isk->inet_daddr) { + if (unlikely(!ssk->dst || !isk->inet_daddr)) { log_error("No destination port/address\n"); + err = -EDESTADDRREQ; goto out; } dport = ssk->dst; @@ -268,7 +270,7 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr totlen = len + sizeof(struct swifthdr) + sizeof(struct iphdr); skb = sock_alloc_send_skb(sk, totlen, msg->msg_flags & MSG_DONTWAIT, &err); - if (!skb) { + if (unlikely(!skb)) { log_error("sock_alloc_send_skb failed\n"); goto out; } @@ -289,7 +291,7 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr log_debug("payload=%p\n", skb_put(skb, len)); err = skb_copy_datagram_from_iovec(skb, sizeof(struct swifthdr), msg->msg_iov, 0, len); - if (err) { + if (unlikely(err)) { log_error("skb_copy_datagram_from_iovec failed\n"); goto out_free; } @@ -304,7 +306,7 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr .flags = inet_sk_flowi_flags(sk), }; err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0); - if (err) { + if (unlikely(err)) { log_error("Route lookup failed\n"); goto out_free; } @@ -312,7 +314,7 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr } err = ip_queue_xmit(skb); - if (!err) + if (likely(!err)) log_debug("Sent %u bytes on wire\n", len); else log_error("ip_queue_xmit failed\n"); @@ -334,7 +336,7 @@ static int swift_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr int err, copied; skb = skb_recv_datagram(sk, flags, flags & MSG_DONTWAIT, &err); - if (!skb) { + if (unlikely(!skb)) { log_error("skb_recv_datagram\n"); goto out; } @@ -351,7 +353,7 @@ static int swift_recvmsg(struct kiocb *iocb, struct socket *sock, struct msghdr } err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied); - if (err) { + if (unlikely(err)) { log_error("skb_copy_datagram_iovec\n"); goto out_free; } @@ -379,7 +381,7 @@ static int swift_rcv(struct sk_buff *skb) struct sockaddr_swift * swift_addr; int err; - if (!pskb_may_pull(skb, sizeof(struct swifthdr))) { + if (unlikely(!pskb_may_pull(skb, sizeof(struct swifthdr)))) { log_error("Insufficient space for header\n"); goto drop; } @@ -387,19 +389,19 @@ static int swift_rcv(struct sk_buff *skb) shdr = (struct swifthdr *) skb->data; len = ntohs(shdr->len); - if (skb->len < len) { + if (unlikely(skb->len < len)) { log_error("Malformed packet (packet_len=%u, skb_len=%u)\n", len, skb->len); goto drop; } - if (len < sizeof(struct swifthdr)) { + if (unlikely(len < sizeof(struct swifthdr))) { log_error("Malformed packet (packet_len=%u sizeof(swifthdr)=%u\n", len, sizeof(struct swifthdr)); goto drop; } src = ntohs(shdr->src); dst = ntohs(shdr->dst); - if (src == 0 || dst == 0 || src >= MAX_SWIFT_PORT || dst >= MAX_SWIFT_PORT) { + if (unlikely(src == 0 || dst == 0 || src >= MAX_SWIFT_PORT || dst >= MAX_SWIFT_PORT)) { log_error("Malformed packet (src=%u, dst=%u)\n", shdr->src, shdr->dst); goto drop; } @@ -427,7 +429,7 @@ static int swift_rcv(struct sk_buff *skb) log_debug("Setting sin_port=%u, sin_addr=%u\n", ntohs(shdr->src), swift_addr->sin_addr.s_addr); err = ip_queue_rcv_skb((struct sock *) &ssk->sock, skb); - if (err) { + if (unlikely(err)) { log_error("ip_queu_rcv_skb\n"); consume_skb(skb); } @@ -484,13 +486,13 @@ static int __init swift_init(void) int rc; rc = proto_register(&swift_prot, 1); - if (rc) { + if (unlikely(rc)) { log_error("Error registering swift protocol\n"); goto out; } rc = inet_add_protocol(&swift_protocol, IPPROTO_SWIFT); - if (rc) { + if (unlikely(rc)) { log_error("Error adding swift protocol\n"); goto out_unregister; } -- 2.20.1 From af42d0a3758abd48a2bd3d5445e21151f4502a04 Mon Sep 17 00:00:00 2001 From: Adrian Bondrescu Date: Sat, 4 Jun 2011 16:09:24 +0300 Subject: [PATCH 07/16] The port is now uint8_t --- src/kernel/swift.c | 20 ++++++++++---------- src/kernel/swift.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/kernel/swift.c b/src/kernel/swift.c index c54567f..1a7e164 100644 --- a/src/kernel/swift.c +++ b/src/kernel/swift.c @@ -14,8 +14,8 @@ MODULE_LICENSE("GPL"); struct swift_sock { struct inet_sock sock; /* swift socket speciffic data */ - __be16 src; - __be16 dst; + uint8_t src; + uint8_t dst; }; static struct swift_sock * sock_port_map[MAX_SWIFT_PORT]; @@ -30,7 +30,7 @@ static inline struct swifthdr * swift_hdr(const struct sk_buff * skb) return (struct swifthdr *) skb_transport_header(skb); } -static inline __be16 get_next_free_port(void) +static inline uint8_t get_next_free_port(void) { int i; for (i = MIN_SWIFT_PORT; i < MAX_SWIFT_PORT; i ++) @@ -39,17 +39,17 @@ static inline __be16 get_next_free_port(void) return 0; } -static inline void swift_unhash(__be16 port) +static inline void swift_unhash(uint8_t port) { sock_port_map[port] = NULL; } -static inline void swift_hash(__be16 port, struct swift_sock *ssh) +static inline void swift_hash(uint8_t port, struct swift_sock *ssh) { sock_port_map[port] = ssh; } -static inline struct swift_sock * swift_lookup(__be16 port) +static inline struct swift_sock * swift_lookup(uint8_t port) { return sock_port_map[port]; } @@ -84,7 +84,7 @@ static int swift_bind(struct socket *sock, struct sockaddr *addr, int addr_len) struct sockaddr_swift *swift_addr; struct swift_sock *ssk; int err; - __be16 port; + uint8_t port; if (unlikely(addr_len < sizeof(struct sockaddr_swift))) { log_error("Invalid size for sockaddr\n"); @@ -199,9 +199,9 @@ out: static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr *msg, size_t len) { int err; - __be16 dport; + uint8_t dport; __be32 daddr; - __be16 sport; + uint8_t sport; struct sk_buff * skb; struct sock * sk; struct inet_sock * isk; @@ -377,7 +377,7 @@ static int swift_rcv(struct sk_buff *skb) struct swifthdr *shdr; struct swift_sock *ssk; __be16 len; - __be16 src, dst; + uint8_t src, dst; struct sockaddr_swift * swift_addr; int err; diff --git a/src/kernel/swift.h b/src/kernel/swift.h index 6c6f331..275b322 100644 --- a/src/kernel/swift.h +++ b/src/kernel/swift.h @@ -9,8 +9,8 @@ #ifdef __KERNEL__ struct swifthdr { - __be16 src; - __be16 dst; + uint8_t src; + uint8_t dst; __be16 len; }; #endif -- 2.20.1 From 66d46e081f580914e8cf78000e9823b788e34948 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 13:26:25 +0300 Subject: [PATCH 08/16] raw: Add usage function to simple test. --- src/raw/swift_raw_simple_test.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/raw/swift_raw_simple_test.c b/src/raw/swift_raw_simple_test.c index 73fc344..dfd1a11 100644 --- a/src/raw/swift_raw_simple_test.c +++ b/src/raw/swift_raw_simple_test.c @@ -15,6 +15,11 @@ #include "debug.h" #include "util.h" +static void usage(const char *argv0) +{ + fprintf(stderr, "Usage: %s local_address swift_hash [remote_address]\n", argv0); +} + /* * Create a socket, bind it and send data. */ @@ -27,8 +32,8 @@ int main(int argc, char *argv[]) ssize_t bytes_sent; int rc; - if (argc < 3 || argc > 4) { - fprintf(stderr,"Usage \"./client ip_local hash ip_dest?\" ."); + if (argc != 3 && argc != 4) { + usage(argv[0]); exit(EXIT_FAILURE); } @@ -43,7 +48,7 @@ int main(int argc, char *argv[]) if (argc > 3) { inet_pton(AF_INET, argv[3], &remote_addr.sin_addr.s_addr); - memcpy(&remote_addr.sw_hash, argv[4], sizeof(struct sw_hash)); + memcpy(&remote_addr.sw_hash, argv[2], sizeof(struct sw_hash)); bytes_sent = sw_sendto(sockfd, buffer, BUFSIZ, 0, (struct sockaddr *) &remote_addr, sizeof(remote_addr)); DIE(bytes_sent < 0, "sw_sendto"); } -- 2.20.1 From 6ad955afd087251b734459a0db9238c7c6822580 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 13:30:31 +0300 Subject: [PATCH 09/16] raw: Remove TODO for socket binding in sw_close test. --- src/raw/test/test_sw_close.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/raw/test/test_sw_close.c b/src/raw/test/test_sw_close.c index f6b0f03..bae346e 100644 --- a/src/raw/test/test_sw_close.c +++ b/src/raw/test/test_sw_close.c @@ -91,8 +91,8 @@ static void close_ok_descriptor_is_bound(void) s = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); DIE(s < 0, "sw_socket"); - /* TODO: Initialize bind address. */ - + memset(&addr, 0, sizeof(addr)); + addr.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(s, (struct sockaddr *) &addr, sizeof(addr)); DIE(rc < 0, "sw_bind"); -- 2.20.1 From 729cf0e52efa496ad15bdfea673d601082e47026 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 13:35:08 +0300 Subject: [PATCH 10/16] raw: Use TABs instead of space in swift_list.c --- src/raw/swift_list.c | 110 +++++++++++++++++++++---------------------- 1 file changed, 55 insertions(+), 55 deletions(-) diff --git a/src/raw/swift_list.c b/src/raw/swift_list.c index c2b5abe..958ab37 100644 --- a/src/raw/swift_list.c +++ b/src/raw/swift_list.c @@ -33,17 +33,17 @@ struct sock_list *list_add_socket(int s) { - struct sock_list *ptr = malloc(sizeof(*ptr)); - if (ptr == NULL) - return NULL; + 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; + 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; + return ptr; } /* @@ -52,16 +52,16 @@ struct sock_list *list_add_socket(int s) struct sock_list *list_update_socket_address(int s, __CONST_SOCKADDR_ARG addr) { - struct sock_list *ptr; + 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)); + for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next) + if (ptr->s == s) { + memcpy(&ptr->addr, addr, sizeof(ptr->addr)); ptr->bind_state = STATE_BOUND; - return ptr; - } + return ptr; + } - return NULL; + return NULL; } /* @@ -70,13 +70,13 @@ struct sock_list *list_update_socket_address(int s, __CONST_SOCKADDR_ARG addr) struct sock_list *list_elem_from_socket(int s) { - struct sock_list *ptr; + struct sock_list *ptr; - for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next) - if (ptr->s == s) - return ptr; + for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next) + if (ptr->s == s) + return ptr; - return NULL; + return NULL; } /* @@ -85,18 +85,18 @@ struct sock_list *list_elem_from_socket(int s) struct sock_list *list_elem_from_address(__CONST_SOCKADDR_ARG addr) { - struct sock_list *ptr; + struct sock_list *ptr; - for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next) { + for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next) { dprintf("socket address to be checked\n"); - if (ptr->bind_state == STATE_NOTBOUND) - continue; + if (ptr->bind_state == STATE_NOTBOUND) + continue; dprintf("bound socket address to be checked\n"); - if (memcmp(&ptr->addr, addr, sizeof(addr)) == 0) - return ptr; - } + if (memcmp(&ptr->addr, addr, sizeof(addr)) == 0) + return ptr; + } - return NULL; + return NULL; } /* @@ -104,18 +104,18 @@ struct sock_list *list_elem_from_address(__CONST_SOCKADDR_ARG addr) */ 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; + 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; } /* @@ -124,14 +124,14 @@ static struct sock_list *list_unlink_socket(int s) int list_remove_socket(int s) { - struct sock_list *ptr; + struct sock_list *ptr; - ptr = list_unlink_socket(s); - if (ptr == NULL) - return -1; + ptr = list_unlink_socket(s); + if (ptr == NULL) + return -1; - free(ptr); - return 0; + free(ptr); + return 0; } /* @@ -139,14 +139,14 @@ int list_remove_socket(int s) */ int list_socket_is_bound(int s) { - struct sock_list *ptr; + 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; - } + 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; + return 0; } -- 2.20.1 From ad0ad8711465667e312781efde2f0de78dfcfc1e Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 13:50:08 +0300 Subject: [PATCH 11/16] raw: Fill sin_family member of sw_sockaddr structure. --- src/raw/test/test_sw_bind.c | 6 ++++++ src/raw/test/test_sw_close.c | 1 + 2 files changed, 7 insertions(+) diff --git a/src/raw/test/test_sw_bind.c b/src/raw/test/test_sw_bind.c index 795a851..5cb866d 100644 --- a/src/raw/test/test_sw_bind.c +++ b/src/raw/test/test_sw_bind.c @@ -80,6 +80,7 @@ static void bind_invalid_ip_address(void) sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; inet_pton(AF_INET, "254.254.254.254", &addr.sin_addr.s_addr); rc = sw_bind(sockfd, (struct sockaddr *) &addr, sizeof(addr)); @@ -101,6 +102,7 @@ static void bind_ok(void) sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(sockfd, (struct sockaddr *) &addr, sizeof(addr)); @@ -117,12 +119,14 @@ static void bind_address_in_use(void) sockfd1 = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr1, 0, sizeof(addr1)); + addr1.sin_family = AF_INET; addr1.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(sockfd1, (struct sockaddr *) &addr1, sizeof(addr1)); dprintf("after first sw_bind rc = %d\n", rc); sockfd2 = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr2, 0, sizeof(addr2)); + addr2.sin_family = AF_INET; addr2.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(sockfd2, (struct sockaddr *) &addr2, sizeof(addr2)); dprintf("after second sw_bind rc = %d\n", rc); @@ -141,10 +145,12 @@ static void bind_socket_already_bound(void) sockfd = sw_socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT); memset(&addr1, 0, sizeof(addr1)); + addr1.sin_family = AF_INET; addr1.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(sockfd, (struct sockaddr *) &addr1, sizeof(addr1)); memset(&addr2, 0, sizeof(addr2)); + addr2.sin_family = AF_INET; addr2.sin_addr.s_addr = INADDR_ANY; addr2.sw_hash.h_array[0] = 0xFF; /* chage hash ("port") */ rc = sw_bind(sockfd, (struct sockaddr *) &addr2, sizeof(addr2)); diff --git a/src/raw/test/test_sw_close.c b/src/raw/test/test_sw_close.c index bae346e..21a86e6 100644 --- a/src/raw/test/test_sw_close.c +++ b/src/raw/test/test_sw_close.c @@ -92,6 +92,7 @@ static void close_ok_descriptor_is_bound(void) DIE(s < 0, "sw_socket"); memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; addr.sin_addr.s_addr = INADDR_ANY; rc = sw_bind(s, (struct sockaddr *) &addr, sizeof(addr)); DIE(rc < 0, "sw_bind"); -- 2.20.1 From 2f07d5aa593476c8abeb88b2115da3349625ffae Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 13:50:30 +0300 Subject: [PATCH 12/16] raw: Replace header comment in swift_list.c. --- src/raw/swift_list.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/raw/swift_list.c b/src/raw/swift_list.c index 958ab37..d359845 100644 --- a/src/raw/swift_list.c +++ b/src/raw/swift_list.c @@ -1,14 +1,8 @@ /* - * swift implementation of syscall API + * Linked list management for sockets * - * Simulates the classic socket syscalls (socket, bind, send, recv). - * Implementation uses raw sockets (AF_INET, SOCK_RAW). - * - * Subsequently, implementation is to be ported into kernel space and - * the interface is going to be offered by the Linux syscall API. - * - * Heavily inspired by GLIBC's - * (/usr/include/sys/socket.h). + * Use sock_list structure to store information about sockets. Use functions + * to add, remove, find and update information in list. * * 2011, Razvan Deaconescu, razvan.deaconescu@cs.pub.ro */ -- 2.20.1 From b0714e2b62a1b0b3b9d716a6431018dd56f1bae0 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 19:03:21 +0300 Subject: [PATCH 13/16] raw: Add socket_manager.h. Wrapper for socket management functions. We are aming for two implementations: list-based and array-based. --- src/raw/include/socket_manager.h | 60 ++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 src/raw/include/socket_manager.h diff --git a/src/raw/include/socket_manager.h b/src/raw/include/socket_manager.h new file mode 100644 index 0000000..e412da4 --- /dev/null +++ b/src/raw/include/socket_manager.h @@ -0,0 +1,60 @@ +/* + * Socket management interface. + * + * 2011, Razvan Deaconescu, razvan.deaconescu@cs.pub.ro + */ + +#ifndef SOCKET_MANAGER_H_ +#define SOCKET_MANAGER_H_ 1 + +#include + +/* + * Add new socket to list. Called by sw_socket "syscall". + */ + +int sm_add(int s); + +/* + * Bind socket to given address. Called by sw_bind "syscall". + */ + +int sm_update_address(int s, const struct sockaddr *addr); + +/* + * Remove socket from list. Called by sw_close "syscall". + */ + +int sm_del(int s); + +/* + * Check if a socket is bound. + */ + +int sm_is_bound(int s); + +/* + * Mark socket as bound. + */ + +int sm_mark_bound(int s); + +/* + * Mark socket as unbound. + */ + +int sm_mark_unbound(int s); + +/* + * Check if adress is asociated with a given socket. + */ + +int sm_address_exists(const struct sockaddr *addr); + +/* + * Find socket address. + */ + +struct sockaddr *sm_get_address(int s); + +#endif -- 2.20.1 From bf58ee2adc522ea0dbd050d94d3625071eb02d1b Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 20:12:39 +0300 Subject: [PATCH 14/16] raw: Update list-based socket management functions. --- src/raw/swift_list.c | 195 ++++++++++++++++++++++++++++++------------- src/raw/swift_raw.c | 67 +++++++-------- 2 files changed, 173 insertions(+), 89 deletions(-) diff --git a/src/raw/swift_list.c b/src/raw/swift_list.c index d359845..04832ac 100644 --- a/src/raw/swift_list.c +++ b/src/raw/swift_list.c @@ -17,130 +17,213 @@ #include #include "swift_types.h" -#include "swift_list.h" +#include "socket_manager.h" #include "debug.h" #include "util.h" +enum sock_bind_state { + STATE_NOTBOUND, + STATE_BOUND +}; + +/* socket management structure */ +struct sock_list { + int s; + struct sockaddr addr; + enum sock_bind_state bind_state; + struct sock_list *next; + struct sock_list *prev; +}; + +/* socket management list head */ +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". + * Find socket in socket management list. */ -struct sock_list *list_add_socket(int s) +static struct sock_list *list_get_link(int s) { - struct sock_list *ptr = malloc(sizeof(*ptr)); - if (ptr == NULL) - return NULL; + 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; +} + +/* + * Find socket in socket management list by address. + */ + +static struct sock_list *list_get_link_by_address(const struct sockaddr *addr) +{ + struct sock_list *ptr; + + for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next) + if (memcmp(addr, &ptr->addr, sizeof(*addr)) == 0) + return ptr; + + return NULL; +} + +/* + * Unlink socket from list. Called by sm_del. + */ + +static void list_unlink(struct sock_list *ptr) +{ + ptr->next->prev = ptr->prev; + ptr->prev->next = ptr->next; + ptr->next = ptr; + ptr->prev = ptr; +} + +/* + * Link socket to list. Add socket to tail of list. + */ +static void list_link(struct sock_list *ptr) +{ ptr->next = &sock_list_head; ptr->prev = sock_list_head.prev; sock_list_head.prev->next = ptr; sock_list_head.prev = ptr; +} + +/* + * Add new socket to list. Called by sw_socket "syscall". + */ + +int sm_add(int s) +{ + struct sock_list *ptr = malloc(sizeof(*ptr)); + if (ptr == NULL) + return -1; + ptr->s = s; + list_link(ptr); - return ptr; + return 0; } /* * Bind socket to given address. Called by sw_bind "syscall". */ -struct sock_list *list_update_socket_address(int s, __CONST_SOCKADDR_ARG addr) +int sm_update_address(int s, const struct sockaddr *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)); - ptr->bind_state = STATE_BOUND; - return ptr; - } + ptr = list_get_link(s); + if (ptr == NULL) + return -1; - return NULL; + memcpy(&ptr->addr, addr, sizeof(ptr->addr)); + + return 0; } /* - * Get list element containing socket s. Called by sw_send* "syscalls". + * Remove socket from list. Called by sw_close "syscall". */ -struct sock_list *list_elem_from_socket(int s) +int sm_del(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; + ptr = list_get_link(s); + if (ptr == NULL) + return -1; - return NULL; + list_unlink(ptr); + free(ptr); + + return 0; } /* - * Get list element containing address addr. Called by sw_bind "syscall". + * Check if a socket is bound. */ -struct sock_list *list_elem_from_address(__CONST_SOCKADDR_ARG addr) +int sm_is_bound(int s) { struct sock_list *ptr; - for (ptr = sock_list_head.next; ptr != &sock_list_head; ptr = ptr->next) { - dprintf("socket address to be checked\n"); - if (ptr->bind_state == STATE_NOTBOUND) - continue; - dprintf("bound socket address to be checked\n"); - if (memcmp(&ptr->addr, addr, sizeof(addr)) == 0) - return ptr; - } + ptr = list_get_link(s); + if (ptr == NULL) + return 0; - return NULL; + if (ptr->bind_state == STATE_BOUND) + return 1; + + return 0; } /* - * Unlink socket from list. Called by list_remove_socket. + * Mark socket as bound. */ -static struct sock_list *list_unlink_socket(int s) + +int sm_mark_bound(int s) { struct sock_list *ptr; + + ptr = list_get_link(s); + if (ptr == NULL) + return -1; - 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; - } + ptr->bind_state = STATE_BOUND; - return NULL; + return 0; } /* - * Remove socket from list. Called by sw_close "syscall". + * Mark socket as unbound. */ -int list_remove_socket(int s) +int sm_mark_unbound(int s) { struct sock_list *ptr; - ptr = list_unlink_socket(s); + ptr = list_get_link(s); if (ptr == NULL) return -1; - free(ptr); + ptr->bind_state = STATE_NOTBOUND; + return 0; } /* - * Check if a socket is bound. + * Check if adress is asociated with a given socket. */ -int list_socket_is_bound(int s) + +int sm_address_exists(const struct sockaddr *addr) { 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; - } + ptr = list_get_link_by_address(addr); + if (ptr == NULL) + return 0; - return 0; + return 1; +} + +/* + * Find socket address. + */ + +struct sockaddr *sm_get_address(int s) +{ + struct sock_list *ptr; + + ptr = list_get_link(s); + if (ptr == NULL) + return NULL; + + return &ptr->addr; } diff --git a/src/raw/swift_raw.c b/src/raw/swift_raw.c index 03170e4..27506ac 100644 --- a/src/raw/swift_raw.c +++ b/src/raw/swift_raw.c @@ -25,7 +25,7 @@ #include "swift_types.h" #include "swift_raw.h" -#include "swift_list.h" +#include "socket_manager.h" #include "debug.h" #include "util.h" @@ -39,7 +39,7 @@ int sw_socket(int __domain, int __type, int __protocol) { int s; - struct sock_list *list; + int rc; if (__domain != PF_INET || __type != SOCK_DGRAM || __protocol != IPPROTO_SWIFT) { errno = EINVAL; @@ -51,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 not bound. */ - list->bind_state = STATE_NOTBOUND; + sm_mark_unbound(s); return s; @@ -75,34 +75,35 @@ 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); + 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; +update_err: +address_err: socket_bound_err: -list_update_err: -list_elem_err: return -1; } @@ -110,21 +111,21 @@ list_elem_err: int sw_getsockname(int __fd, __SOCKADDR_ARG __addr, socklen_t *__restrict __len) { - struct sock_list *list; + struct sockaddr *addr; /* Find socket in management structure. */ - list = list_elem_from_socket(__fd); - if (list == NULL) { - errno = EBADF; - goto list_elem_err; + addr = sm_get_address(__fd); + if (addr == NULL) { + errno = EINVAL; + goto address_err; } - memcpy(__addr, &list->addr, sizeof(list->addr)); - *__len = sizeof(list->addr); + memcpy(__addr, &addr, sizeof(addr)); + *__len = sizeof(addr); return 0; -list_elem_err: +address_err: return -1; } @@ -140,13 +141,13 @@ 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; struct sockaddr_sw *__sw_addr = (struct sockaddr_sw *) __addr; + int rc; - list = list_elem_from_socket(__fd); - if (list != NULL && list->bind_state == STATE_NOTBOUND) { + rc = sm_is_bound(__fd); + if (rc < 0) { errno = EAFNOSUPPORT; goto sock_err; } @@ -190,17 +191,17 @@ ssize_t sw_recvfrom(int __fd, void *__restrict __buf, size_t __n, socklen_t *__restrict __addr_len) { ssize_t bytes_recv; - struct sock_list *list; struct iovec __iov[1]; struct msghdr __msgh; struct sockaddr_sw *__sw_addr = (struct sockaddr_sw *) __addr; + int rc; - list = list_elem_from_socket(__fd); - if (list != NULL && list->bind_state == STATE_NOTBOUND) { + rc = sm_is_bound(__fd); + if (rc < 0) { errno = EAFNOSUPPORT; goto sock_err; } - + /* TODO */ return recvmsg(__fd, &__msgh, 0); @@ -276,15 +277,15 @@ int sw_close(int __fd) int rc; /* Remove socket from socket management structure. */ - rc = list_remove_socket(__fd); + 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; } -- 2.20.1 From 62d134e27244c31bb797981b04dd2b6f5aa0eac2 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 20:16:06 +0300 Subject: [PATCH 15/16] raw: Rename old list-based socket management source code. --- src/raw/Makefile | 6 +++--- src/raw/{swift_list.c => socket_manager_list.c} | 0 src/raw/test/Makefile | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename src/raw/{swift_list.c => socket_manager_list.c} (100%) diff --git a/src/raw/Makefile b/src/raw/Makefile index ebe30f3..4783fcb 100644 --- a/src/raw/Makefile +++ b/src/raw/Makefile @@ -6,13 +6,13 @@ CFLAGS = -Wall -g all: swift_raw_simple_test -swift_raw_simple_test: swift_raw_simple_test.o swift_raw.o swift_list.o +swift_raw_simple_test: swift_raw_simple_test.o swift_raw.o socket_manager_list.o swift_raw_simple_test.o: swift_raw_simple_test.c include/swift_raw.h include/util.h -swift_raw.o: swift_raw.c include/swift_list.h include/swift_raw.h include/debug.h include/util.h +swift_raw.o: swift_raw.c include/socket_manager.h include/swift_raw.h include/debug.h include/util.h -swift_list.o: swift_list.c include/swift_list.h +socket_manager_list.o: socket_manager_list.c include/socket_manager.h clean: -rm -f *~ diff --git a/src/raw/swift_list.c b/src/raw/socket_manager_list.c similarity index 100% rename from src/raw/swift_list.c rename to src/raw/socket_manager_list.c diff --git a/src/raw/test/Makefile b/src/raw/test/Makefile index 0ea2f98..37be350 100644 --- a/src/raw/test/Makefile +++ b/src/raw/test/Makefile @@ -11,7 +11,7 @@ test: test.o test_sw_socket.o test_sw_bind.o test_sw_getsockname.o \ test_sw_sendmsg.o test_sw_recvmsg.o \ test_sw_setsockopt.o test_sw_getsockopt.o \ test_sw_close.o test_dummy.o test_common.o \ - ../swift_raw.o ../swift_list.o + ../swift_raw.o ../socket_manager_list.o ../swift_raw.o: ../swift_raw.c ../include/swift_raw.h make -C .. swift_raw.o -- 2.20.1 From 745bdfe7446c92353c92ade6d483d7aba8993586 Mon Sep 17 00:00:00 2001 From: Razvan Deaconescu Date: Sat, 4 Jun 2011 20:18:38 +0300 Subject: [PATCH 16/16] raw: Remove old list-based socket management header. --- src/raw/include/swift_list.h | 58 ------------------------------------ 1 file changed, 58 deletions(-) delete mode 100644 src/raw/include/swift_list.h diff --git a/src/raw/include/swift_list.h b/src/raw/include/swift_list.h deleted file mode 100644 index 62d547c..0000000 --- a/src/raw/include/swift_list.h +++ /dev/null @@ -1,58 +0,0 @@ -#ifndef __SOCK_LIST - -#define __SOCK_LIST - -enum sock_bind_state { - STATE_NOTBOUND, - STATE_BOUND -}; - -/* socket management structure */ -struct sock_list { - int s; - struct sockaddr_sw addr; - 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". - */ -struct sock_list *list_add_socket(int s); - -/* - * Bind socket to given address. Called by sw_bind "syscall". - */ - -struct sock_list *list_update_socket_address(int s, __CONST_SOCKADDR_ARG addr); - -/* - * Get list element containing socket s. Called by sw_send* "syscalls". - */ - -struct sock_list *list_elem_from_socket(int s); - -/* - * Get list element containing address addr. Called by sw_bind "syscall". - */ - -struct sock_list *list_elem_from_address(__CONST_SOCKADDR_ARG addr); - -/* - * Remove socket from list. Called by sw_close "syscall". - */ - -int list_remove_socket(int s); - -/* - * Check if a socket is bound. - */ -int list_socket_is_bound(int s); - -#endif -- 2.20.1