Implement one to manny transmission. Also modify the test files.

diff --git a/src/kernel/swift.c b/src/kernel/swift.c
index b21c106..1df2d58 100644 (file)
--- a/src/kernel/swift.c
+++ b/src/kernel/swift.c
@@ -197,130 +197,145 @@ static int swift_sendmsg(struct kiocb *iocb, struct socket *sock, struct msghdr
 {
        int err;
        uint8_t dport;
-       __be32 daddr;
-       uint8_t sport;
-       struct sk_buff * skb;
-       struct sock * sk; 
-       struct inet_sock * isk;
-       struct swift_sock * ssk;
-       struct swifthdr * shdr;
-       int connected = 0;
-       int totlen;
-       struct rtable * rt = NULL;
-       
-       if (unlikely(sock == NULL)) {
-               log_error("Sock is NULL\n");
-               err = -EINVAL;
-               goto out;
-       }
-       sk = sock->sk;
-
-       if (unlikely(sk == NULL)) {
-               log_error("Sock->sk is NULL\n");
-               err = -EINVAL;
-               goto out;
-       }
+    __be32 daddr;
+    uint8_t sport;
+    struct sk_buff * skb;
+    struct sock * sk; 
+    struct inet_sock * isk;
+    struct swift_sock * ssk;
+    struct swifthdr * shdr;
+    int connected = 0;
+    int totlen;
+    struct rtable * rt = NULL;
+    int dests = 0;
+    int i;
+    struct sockaddr_swift * swift_addr = NULL;
+
+    if (unlikely(sock == NULL)) {
+        log_error("Sock is NULL\n");
+        err = -EINVAL;
+        goto out;
+    }
+    sk = sock->sk;
+
+    if (unlikely(sk == NULL)) {
+        log_error("Sock->sk is NULL\n");
+        err = -EINVAL;
+        goto out;
+    }
+
+    isk = inet_sk(sk);
+    ssk = swift_sk(sk);
+
+    sport = ssk->src;
+    if (sport == 0) {
+        sport = get_next_free_port();
+        if (unlikely(sport == 0)) {
+            log_error("No free ports\n");
+            err = -ENOMEM;
+            goto out;
+        }
+    }
+
+    if (msg->msg_name) {
+        swift_addr = (struct sockaddr_swift *) msg->msg_name;
 
-       isk = inet_sk(sk);
-       ssk = swift_sk(sk);
-
-       sport = ssk->src;
-       if (sport == 0) {
-               sport = get_next_free_port();
-               if (unlikely(sport == 0)) {
-                       log_error("No free ports\n");
-                       err = -ENOMEM;
-                       goto out;
-               }
-       }
-
-       if (msg->msg_name) {
-               struct sockaddr_swift * swift_addr = (struct sockaddr_swift *) msg->msg_name;
-               
         if (unlikely(msg->msg_namelen < sizeof(*swift_addr) || 
                      msg->msg_namelen < swift_addr->count * sizeof(struct swift_dest) || 
                      swift_addr->count <= 0)) {
-                       log_error("Invalid size for msg_name\n");
-                       err = -EINVAL;
-                       goto out;
-               }
-               
-               dport = swift_addr->dests[0].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->dests[0].addr;
-               log_debug("Received from user space destination port=%u and address=%u\n", dport, daddr);
-       } else {
-               if (unlikely(!ssk->dst || !isk->inet_daddr)) {
-                       log_error("No destination port/address\n");
-                       err = -EDESTADDRREQ;
-                       goto out;
-               }
-               dport = ssk->dst;
-               daddr = isk->inet_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 (unlikely(!skb)) {
-               log_error("sock_alloc_send_skb failed\n");
-               goto out;
-       }
-       log_debug("Allocated %u bytes for skb (payload size=%u)\n", totlen, len);
-
-       skb_reset_network_header(skb);
-       skb_reserve(skb, sizeof(struct iphdr));
-       log_debug("Reseted network header\n");
-       skb_reset_transport_header(skb);
-       skb_put(skb, sizeof(struct swifthdr));
-       log_debug("Reseted transport header\n");
-
-       shdr = (struct swifthdr *) skb_transport_header(skb);
-       shdr->dst = dport;
-       shdr->src = sport;
-       shdr->len = ntohs(len + sizeof(struct swifthdr));
-
-       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 (unlikely(err)) {
-               log_error("skb_copy_datagram_from_iovec failed\n");
-               goto out_free;
-       }
-       log_debug("Copied %u bytes into the skb\n", len);
-
-       if (connected)
-               rt = (struct rtable *) __sk_dst_check(sk, 0);
-
-       if (rt == NULL) {
-               struct flowi fl = { .fl4_dst = daddr,
-                                   .proto = sk->sk_protocol,
-                                   .flags = inet_sk_flowi_flags(sk),
-                                 };
-               err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0);
-               if (unlikely(err)) {
-                       log_error("Route lookup failed\n");
-                       goto out_free;
-               }
+            log_error("Invalid size for msg_name\n");
+            err = -EINVAL;
+            goto out;
+        }
+
+        dests = swift_addr->count;
+    } else {
+        BUG();
+        if (unlikely(!ssk->dst || !isk->inet_daddr)) {
+            log_error("No destination port/address\n");
+            err = -EDESTADDRREQ;
+            goto out;
+        }
+        dport = ssk->dst;
+        daddr = isk->inet_daddr;
+
+        log_debug("Got from socket destination port=%u and address=%u\n", dport, daddr);
+        connected = 1;
+    }
+
+    if (msg->msg_iovlen < dests)
+        dests = msg->msg_iovlen;
+
+    for (i = 0; i < dests; i++) {
+        struct swift_dest *dest = &swift_addr->dests[i];
+        struct iovec *iov = &msg->msg_iov[i];
+
+        dport = dest->port;
+        if (unlikely(dport == 0 || dport >= MAX_SWIFT_PORT)) {
+            log_error("Invalid value for destination port(%u)\n", dport);
+            err = -EINVAL;
+            goto out;
+        }      
+
+        daddr = dest->addr;
+        log_debug("Received from user space destination port=%u and address=%u\n", dport, daddr);
+
+        len = iov->iov_len;
+        totlen = len + sizeof(struct swifthdr) + sizeof(struct iphdr);
+        skb = sock_alloc_send_skb(sk, totlen, msg->msg_flags & MSG_DONTWAIT, &err);
+        if (unlikely(!skb)) {
+            log_error("sock_alloc_send_skb failed\n");
+            goto out;
+        }
+        log_debug("Allocated %u bytes for skb (payload size=%u)\n", totlen, len);
+
+        skb_reset_network_header(skb);
+        skb_reserve(skb, sizeof(struct iphdr));
+        log_debug("Reseted network header\n");
+        skb_reset_transport_header(skb);
+        skb_put(skb, sizeof(struct swifthdr));
+        log_debug("Reseted transport header\n");
+
+        shdr = (struct swifthdr *) skb_transport_header(skb);
+        shdr->dst = dport;
+        shdr->src = sport;
+        shdr->len = ntohs(len + sizeof(struct swifthdr));
+
+        log_debug("payload=%p\n", skb_put(skb, len));
+
+        err = skb_copy_datagram_from_iovec(skb, sizeof(struct swifthdr), iov, 0, len);
+        if (unlikely(err)) {
+            log_error("skb_copy_datagram_from_iovec failed\n");
+            goto out_free;
+        }
+        log_debug("Copied %u bytes into the skb\n", len);
+
+        if (connected)
+            rt = (struct rtable *) __sk_dst_check(sk, 0);
+
+        if (rt == NULL) {
+            struct flowi fl = { .fl4_dst = daddr,
+                .proto = sk->sk_protocol,
+                .flags = inet_sk_flowi_flags(sk),
+            };
+            err = ip_route_output_flow(sock_net(sk), &rt, &fl, sk, 0);
+            if (unlikely(err)) {
+                log_error("Route lookup failed\n");
+                goto out_free;
+            }
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 36)
-               sk_dst_set(sk, dst_clone(&rt->u.dst));
+            sk_dst_set(sk, dst_clone(&rt->u.dst));
 #else
-               sk_dst_set(sk, dst_clone(&rt->dst));
+            sk_dst_set(sk, dst_clone(&rt->dst));
 #endif
-       }
-       
-       err = ip_queue_xmit(skb);
-       if (likely(!err))
-               log_debug("Sent %u bytes on wire\n", len);
-       else
-               log_error("ip_queue_xmit failed\n");
+        }
+
+        err = ip_queue_xmit(skb);
+        if (likely(!err))
+            log_debug("Sent %u bytes on wire\n", len);
+        else
+            log_error("ip_queue_xmit failed\n");
+    }
 
        return err;
 

diff --git a/test/client.c b/test/client.c
index ddd6202..dd8bebf 100644 (file)
--- a/test/client.c
+++ b/test/client.c
@@ -32,25 +32,31 @@ int main(int argc, const char *argv[])
     }
 
     char buf[] = "Buffer de test";
-    struct iovec iov[1];
+    char buf2[] = "Buffer2";
+    struct iovec iov[2];
     struct msghdr msg;
-    struct sockaddr_swift *to = malloc(size);
+    int size2 = sizeof(struct sockaddr_swift) + 2 * sizeof(struct swift_dest);
+    struct sockaddr_swift *to = malloc(size2);
 
     memset(&msg, 0, sizeof(msg));
     memset(&iov, 0, sizeof(iov));
-    memset(to, 0, size);
+    memset(to, 0, size2);
 
     iov[0].iov_base = buf;
     iov[0].iov_len = sizeof(buf);
+    iov[1].iov_base = buf2;
+    iov[1].iov_len = sizeof(buf2);
 
-    to->count = 1;
+    to->count = 2;
     to->dests[0].addr = 0x0100007F;
     to->dests[0].port = 100;
+    to->dests[1].addr = 0x0100007F;
+    to->dests[1].port = 101;
 
     msg.msg_iov = iov;
-    msg.msg_iovlen = 1;
+    msg.msg_iovlen = 2;
     msg.msg_name = to;
-    msg.msg_namelen = size;
+    msg.msg_namelen = size2;
 
     int ret;
 

diff --git a/test/server.c b/test/server.c
index b0f1ea8..32b9be6 100644 (file)
--- a/test/server.c
+++ b/test/server.c
@@ -11,6 +11,11 @@ int main(int argc, const char *argv[])
 {
     int sock;
 
+    if (argc != 2) {
+        fprintf(stderr, "USAGE: %s listening_port\n", argv[0]);
+        return -1;
+    }
+
     sock = socket(PF_INET, SOCK_DGRAM, IPPROTO_SWIFT);
     if (sock < 0) {
         perror("Failed to create socket");
@@ -23,7 +28,7 @@ int main(int argc, const char *argv[])
 
     saddr->count = 1;
     saddr->dests[0].addr = 0x0100007F;
-    saddr->dests[0].port = 100;
+    saddr->dests[0].port = atoi(argv[1]);
 
     if (bind(sock, (struct sockaddr *) saddr, size) < 0) {
         perror("Failed to bind socket");