X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=f7db6fc8ac8b17dfb8452e93b91b0155f26cb366;hp=95d2ba8a8a2447a2cfaa1dc8a003b081538628f5;hb=0a274dcc2f82620033b57dfb4f7b887302e7b207;hpb=1f556ae88bd8c85d4452f689f532f5a6abeabe92

diff --git a/dccp_recv.c b/dccp_recv.c
index 95d2ba8a..f7db6fc8 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -16,6 +16,8 @@
  *     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>
@@ -35,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
@@ -66,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;
@@ -106,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;
@@ -115,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;
@@ -136,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;
 }