fix trivial compiler warning in net.c

[paraslash.git] / dccp_recv.c

diff --git a/dccp_recv.c b/dccp_recv.c
index f56f58cbb2932ca95c0056f96df30ec5150b7519..f7db6fc8ac8b17dfb8452e93b91b0155f26cb366 100644 (file)
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,3 +1,28 @@
+/*
+ * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ *
+ *     This program is free software; you can redistribute it and/or modify
+ *     it under the terms of the GNU General Public License as published by
+ *     the Free Software Foundation; either version 2 of the License, or
+ *     (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU General Public License for more details.
+ *
+ *     You should have received a copy of the GNU General Public License
+ *     along with this program; if not, write to the Free Software
+ *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ */
+
+/** \file dccp_recv.c paraslash's dccp receiver */
+
+/*
+ * based on client.c of dccp-cs-0.01.tar.bz2,
+ * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
+ */
+
 #include "para.h"
 #include "error.h"
 #include "dccp.h"
@@ -12,8 +37,8 @@
 #include <sys/socket.h>
 #include <netdb.h>
 
-
-#define DCCP_BUFSIZE 4096
+/** the size of the output buffer */
+#define DCCP_BUFSIZE 40960
 
 /**
  * data specific to the dccp receiver
@@ -43,7 +68,7 @@ static void dccp_recv_close(struct receiver_node *rn)
 static int dccp_recv_open(struct receiver_node *rn)
 {
        struct private_dccp_recv_data *pdd;
-       struct gengetopt_args_info *conf = rn->conf;
+       struct dccp_recv_args_info *conf = rn->conf;
        int ret;
        struct addrinfo *ai;
        char *tmp;
@@ -83,7 +108,7 @@ static void dccp_shutdown(void)
 
 static void *dccp_recv_parse_config(int argc, char **argv)
 {
-       struct gengetopt_args_info *tmp = para_calloc(sizeof(struct gengetopt_args_info));
+       struct dccp_recv_args_info *tmp = para_calloc(sizeof(struct dccp_recv_args_info));
 
        if (!dccp_recv_cmdline_parser(argc, argv, tmp))
                return tmp;
@@ -92,17 +117,18 @@ static void *dccp_recv_parse_config(int argc, char **argv)
 }
 
 static int dccp_recv_pre_select(struct receiver_node *rn, fd_set *rfds,
-               __unused fd_set *wfds, __unused struct timeval *timeout)
+               __a_unused fd_set *wfds, __a_unused struct timeval *timeout)
 {
        struct private_dccp_recv_data *pdd = rn->private_data;
 
-       if (pdd)
-               FD_SET(pdd->fd, rfds);
+       if (!pdd)
+               return -1;
+       FD_SET(pdd->fd, rfds);
        return pdd->fd;
 }
 
 static int dccp_recv_post_select(struct receiver_node *rn, int select_ret,
-               fd_set *rfds, __unused fd_set *wfds)
+               fd_set *rfds, __a_unused fd_set *wfds)
 {
        int ret;
        struct private_dccp_recv_data *pdd = rn->private_data;
@@ -113,8 +139,10 @@ static int dccp_recv_post_select(struct receiver_node *rn, int select_ret,
                return -E_DCCP_OVERRUN;
        ret = recv_bin_buffer(pdd->fd, rn->buf + rn->loaded,
                DCCP_BUFSIZE - rn->loaded);
-       if (ret <= 0)
+       if (ret <= 0) {
+               PARA_INFO_LOG("%s\n", ret? PARA_STRERROR(-ret) : "eof");
                return ret;
+       }
        rn->loaded += ret;
        return 1;
 }