X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=755473c9e1f3a556302b7e7890959d919a80b1a9;hp=47351afbae731a08498f08692074b1670a05c490;hb=3913d265cd6c3b8e43bac4f1f0deb1e96bc95a15;hpb=2c679eeb8bbc93220f85403eca6e9380dc624a6a

diff --git a/dccp_recv.c b/dccp_recv.c
index 47351afb..755473c9 100644
--- a/dccp_recv.c
+++ b/dccp_recv.c
@@ -16,7 +16,6 @@
 
 #include "para.h"
 #include "error.h"
-#include "dccp.h"
 #include "list.h"
 #include "sched.h"
 #include "recv.h"
@@ -26,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
 
@@ -63,40 +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 = PARA_CONNECT(pdd->fd, ai->ai_addr);
-	freeaddrinfo(ai);
-	if (ret < 0) {
-		ret = -E_DCCP_CONNECT;
-		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)