X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=b9d61c587d3ebfe375963a4ee4d73fc1291fad1f;hp=1aab14fbb43e82591472393cd177de13e015c1f2;hb=c5a016fb52918b53dc828d3b0d16df3dcac2fcfe;hpb=e1890028c21d233087266fd7997d68a88cb9afce

diff --git a/client_common.c b/client_common.c
index 1aab14fb..b9d61c58 100644
--- a/client_common.c
+++ b/client_common.c
@@ -76,12 +76,14 @@ void client_close(struct private_client_data *pcd)
 	free(pcd);
 }
 
+/* connect to para_server and register the client task */
 static int client_connect(struct private_client_data *pcd)
 {
 	int ret;
 
 	pcd->fd = -1;
-	ret = tcp_connect(pcd->conf.hostname_arg, pcd->conf.server_port_arg);
+	ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, pcd->conf.hostname_arg,
+						  pcd->conf.server_port_arg);
 	if (ret < 0)
 		return ret;
 	pcd->fd = ret;
@@ -223,8 +225,8 @@ void client_pre_select(struct sched *s, struct task *t)
 			para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
 			pcd->check_w = 1;
 		} else {
-			if (*pcd->in_eof) {
-				t->ret = -E_INPUT_EOF;
+			if (*pcd->in_error) {
+				t->ret = *pcd->in_error;
 				s->timeout.tv_sec = 0;
 				s->timeout.tv_usec = 1;
 			}
@@ -373,7 +375,7 @@ void client_post_select(struct sched *s, struct task *t)
 		t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded);
 		if (t->ret < 0)
 			return;
-		*pcd->in_loaded = 0; /* FIXME: short writes */
+		*pcd->in_loaded = 0;
 		return;
 	case CL_RECEIVING:
 		t->ret = client_recv_buffer(pcd);