Use sideband also for challenge response.
[paraslash.git] / udp_recv.c
index 4f363cc..c1f2383 100644 (file)
@@ -1,12 +1,11 @@
 /*
 /*
- * Copyright (C) 2005-2009 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2012 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file udp_recv.c Paraslash's udp receiver */
 
 #include <regex.h>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file udp_recv.c Paraslash's udp receiver */
 
 #include <regex.h>
-#include <dirent.h>
 #include <sys/socket.h>
 #include <net/if.h>
 
 #include <sys/socket.h>
 #include <net/if.h>
 
 #include "fd.h"
 #include "buffer_tree.h"
 
 #include "fd.h"
 #include "buffer_tree.h"
 
-/**
- * Data specific to the udp receiver.
- *
- * \sa \ref receiver, \ref receiver_node.
- */
-struct private_udp_recv_data {
-       /** The socket file descriptor. */
-       int fd;
-       struct btr_pool *btrp;
-       struct timeval last_read_time;
-};
-
 static void udp_recv_pre_select(struct sched *s, struct task *t)
 {
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
 static void udp_recv_pre_select(struct sched *s, struct task *t)
 {
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
-       struct private_udp_recv_data *purd = rn->private_data;
 
        if (generic_recv_pre_select(s, t) <= 0)
                return;
 
        if (generic_recv_pre_select(s, t) <= 0)
                return;
-       para_fd_set(purd->fd, &s->rfds, &s->max_fileno);
+       para_fd_set(rn->fd, &s->rfds, &s->max_fileno);
 }
 
 static int udp_check_eof(size_t sz, struct iovec iov[2])
 }
 
 static int udp_check_eof(size_t sz, struct iovec iov[2])
@@ -66,64 +52,48 @@ static int udp_check_eof(size_t sz, struct iovec iov[2])
 static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
 static void udp_recv_post_select(__a_unused struct sched *s, struct task *t)
 {
        struct receiver_node *rn = container_of(t, struct receiver_node, task);
-       struct private_udp_recv_data *purd = rn->private_data;
        struct btr_node *btrn = rn->btrn;
        struct btr_node *btrn = rn->btrn;
-       size_t packet_size;
+       size_t num_bytes;
        struct iovec iov[2];
        struct iovec iov[2];
-       int ret, iovcnt;
+       int ret, readv_ret, iovcnt;
 
        t->error = 0;
        ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
 
        t->error = 0;
        ret = btr_node_status(btrn, 0, BTR_NT_ROOT);
-       if (ret < 0)
-               goto err;
-       if (ret == 0)
-               return;
-       if (!FD_ISSET(purd->fd, &s->rfds)) {
-               struct timeval tmp;
-               tv_add(&purd->last_read_time, &(struct timeval)EMBRACE(5, 0),
-                       &tmp);
-               ret = -E_UDP_TIMEOUT;
-               if (tv_diff(now, &tmp, NULL) > 0)
-                       goto err;
-               return;
-       }
-       iovcnt = btr_pool_get_buffers(purd->btrp, iov);
+       if (ret <= 0)
+               goto out;
+       iovcnt = btr_pool_get_buffers(rn->btrp, iov);
        ret = -E_UDP_OVERRUN;
        if (iovcnt == 0)
        ret = -E_UDP_OVERRUN;
        if (iovcnt == 0)
-               goto err;
-       ret = para_readv(purd->fd, iov, iovcnt);
-       if (ret == 0)
-               ret = -E_RECV_EOF;
-       if (ret < 0)
-               goto err;
-       packet_size = ret;
-       ret = udp_check_eof(packet_size, iov);
+               goto out;
+       ret = readv_nonblock(rn->fd, iov, iovcnt, &s->rfds, &num_bytes);
+       if (num_bytes == 0)
+               goto out;
+       readv_ret = ret;
+       ret = udp_check_eof(num_bytes, iov);
        if (ret < 0)
        if (ret < 0)
-               goto err;
-       purd->last_read_time = *now;
-       if (iov[0].iov_len >= packet_size)
-               btr_add_output_pool(purd->btrp, packet_size, btrn);
+               goto out;
+       if (iov[0].iov_len >= num_bytes)
+               btr_add_output_pool(rn->btrp, num_bytes, btrn);
        else { /* both buffers contain data */
        else { /* both buffers contain data */
-               btr_add_output_pool(purd->btrp, iov[0].iov_len, btrn);
-               btr_add_output_pool(purd->btrp, packet_size - iov[0].iov_len,
+               btr_add_output_pool(rn->btrp, iov[0].iov_len, btrn);
+               btr_add_output_pool(rn->btrp, num_bytes - iov[0].iov_len,
                        btrn);
        }
                        btrn);
        }
-       return;
-err:
+       ret = readv_ret;
+out:
+       if (ret >= 0)
+               return;
        btr_remove_node(btrn);
        t->error = ret;
        btr_remove_node(btrn);
        t->error = ret;
-       close(purd->fd);
-       purd->fd = -1;
+       close(rn->fd);
+       rn->fd = -1;
 }
 
 static void udp_recv_close(struct receiver_node *rn)
 {
 }
 
 static void udp_recv_close(struct receiver_node *rn)
 {
-       struct private_udp_recv_data *purd = rn->private_data;
-
-       if (purd->fd >= 0)
-               close(purd->fd);
-       btr_pool_free(purd->btrp);
-       free(rn->private_data);
+       if (rn->fd >= 0)
+               close(rn->fd);
+       btr_pool_free(rn->btrp);
 }
 
 static void *udp_recv_parse_config(int argc, char **argv)
 }
 
 static void *udp_recv_parse_config(int argc, char **argv)
@@ -155,9 +125,11 @@ static int mcast_receiver_setup(int fd, const char *iface)
 
        if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0)
                goto err;
 
        if (getsockname(fd, (struct sockaddr *)&ss, &sslen) < 0)
                goto err;
+       assert(ss.ss_family == AF_INET || ss.ss_family == AF_INET6);
 
        if (iface != NULL && id == 0)
 
        if (iface != NULL && id == 0)
-               PARA_WARNING_LOG("could not resolve interface %s, using default", iface);
+               PARA_WARNING_LOG("could not resolve interface %s, using default\n",
+                       iface);
 
        switch (ss.ss_family) {
        case AF_INET:
 
        switch (ss.ss_family) {
        case AF_INET:
@@ -172,12 +144,13 @@ static int mcast_receiver_setup(int fd, const char *iface)
 
                        m4.imr_interface.s_addr = INADDR_ANY;
                        if (id != 0)
 
                        m4.imr_interface.s_addr = INADDR_ANY;
                        if (id != 0)
-                               PARA_ERROR_LOG("Setting IPv4 receiver mcast interface not supported.");
+                               PARA_ERROR_LOG("Setting IPv4 receiver mcast interface not supported\n");
 
 #endif
 
 #endif
-                       m4.imr_multiaddr        = ((struct sockaddr_in *)&ss)->sin_addr;
+                       m4.imr_multiaddr = ((struct sockaddr_in *)&ss)->sin_addr;
 
 
-                       if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &m4, sizeof(m4)) < 0)
+                       if (setsockopt(fd, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+                                       &m4, sizeof(m4)) < 0)
                                break;
                }
                return 0;
                                break;
                }
                return 0;
@@ -192,9 +165,6 @@ static int mcast_receiver_setup(int fd, const char *iface)
                                break;
                }
                return 0;
                                break;
                }
                return 0;
-       default:
-               PARA_ERROR_LOG("address family %d not supported", ss.ss_family);
-               return -E_ADDRESS_LOOKUP;
        }
 err:
        return -ERRNO_TO_PARA_ERROR(errno);
        }
 err:
        return -ERRNO_TO_PARA_ERROR(errno);
@@ -202,37 +172,31 @@ err:
 
 static int udp_recv_open(struct receiver_node *rn)
 {
 
 static int udp_recv_open(struct receiver_node *rn)
 {
-       struct private_udp_recv_data *purd;
        struct udp_recv_args_info *c = rn->conf;
        char  *iface = c->iface_given ? c->iface_arg : NULL;
        int ret;
 
        struct udp_recv_args_info *c = rn->conf;
        char  *iface = c->iface_given ? c->iface_arg : NULL;
        int ret;
 
-       rn->private_data = para_calloc(sizeof(struct private_udp_recv_data));
-       purd = rn->private_data;
-
        ret = makesock(IPPROTO_UDP, 1, c->host_arg, c->port_arg, NULL);
        if (ret < 0)
                goto err;
        ret = makesock(IPPROTO_UDP, 1, c->host_arg, c->port_arg, NULL);
        if (ret < 0)
                goto err;
-       purd->fd = ret;
+       rn->fd = ret;
 
 
-       ret = mcast_receiver_setup(purd->fd, iface);
+       ret = mcast_receiver_setup(rn->fd, iface);
        if (ret < 0) {
        if (ret < 0) {
-               close(purd->fd);
+               close(rn->fd);
                goto err;
        }
 
                goto err;
        }
 
-       ret = mark_fd_nonblocking(purd->fd);
+       ret = mark_fd_nonblocking(rn->fd);
        if (ret < 0) {
        if (ret < 0) {
-               close(purd->fd);
+               close(rn->fd);
                goto err;
        }
        PARA_INFO_LOG("receiving from %s:%d, fd=%d\n", c->host_arg,
                goto err;
        }
        PARA_INFO_LOG("receiving from %s:%d, fd=%d\n", c->host_arg,
-               c->port_arg, purd->fd);
-       purd->btrp = btr_pool_new("udp_recv", 320 * 1024);
-       purd->last_read_time = *now;
-       return purd->fd;
+               c->port_arg, rn->fd);
+       rn->btrp = btr_pool_new("udp_recv", 320 * 1024);
+       return rn->fd;
 err:
 err:
-       free(rn->private_data);
        return ret;
 }
 
        return ret;
 }