X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=755473c9e1f3a556302b7e7890959d919a80b1a9;hp=943b8283e6a0f135c3b0edbc3cd5de44e250cedb;hb=3913d265cd6c3b8e43bac4f1f0deb1e96bc95a15;hpb=6969c9fa8293a44daf7ba5a0426573fcd71c1953

diff --git a/dccp_recv.c b/dccp_recv.c
index 943b8283..755473c9 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -1,19 +1,7 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 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.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file dccp_recv.c paraslash's dccp receiver */
@@ -23,9 +11,11 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "error.h"
-#include "dccp.h"
 #include "list.h"
 #include "sched.h"
 #include "recv.h"
@@ -35,11 +25,6 @@
 
 #include "dccp_recv.cmdline.h"
 
-/* needed by getaddrinfo */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-
 /** the size of the output buffer */
 #define DCCP_BUFSIZE 40960
 
@@ -72,37 +57,17 @@ static int dccp_recv_open(struct receiver_node *rn)
 {
 	struct private_dccp_recv_data *pdd;
 	struct dccp_recv_args_info *conf = rn->conf;
-	int ret;
-	struct addrinfo *ai;
-	char *tmp;
+	int ret = makesock(AF_UNSPEC, IPPROTO_DCCP, 0, conf->host_arg, conf->port_arg);
 
-	rn->buf = para_calloc(DCCP_BUFSIZE);
-	rn->private_data = para_calloc(sizeof(struct private_dccp_recv_data));
-	pdd = rn->private_data;
-	ret = dccp_get_socket();
 	if (ret < 0)
-		goto err_out;
-	pdd->fd = ret;
+		return ret;
 
-	tmp = make_message("%d", conf->port_arg);
-	ret = getaddrinfo(conf->host_arg, tmp, NULL, &ai);
-	free(tmp);
-	if (ret) {
-		ret = -E_ADDR_INFO;
-		goto err_out;
-	}
-	ret = dccp_set_socket(pdd->fd);
-	if (ret < 0)
-		goto err_out;
-	PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, conf->port_arg);
-	ret = -E_DCCP_CONNECT;
-	if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0)
-		goto err_out;
-	mark_fd_nonblock(pdd->fd);
+	rn->buf = para_calloc(DCCP_BUFSIZE);
+	rn->private_data = pdd = para_calloc(sizeof(struct private_dccp_recv_data));
+
+	pdd->fd = ret;
+	mark_fd_nonblocking(pdd->fd);
 	return 1;
-err_out:
-	dccp_recv_close(rn);
-	return ret;
 }
 
 static void dccp_shutdown(void)