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

diff --git a/client_common.c b/client_common.c
index d950d2d7..b9d61c58 100644
--- a/client_common.c
+++ b/client_common.c
@@ -6,6 +6,9 @@
 
 /** \file client_common.c common functions of para_client and para_audiod */
 
+#include <sys/types.h>
+#include <dirent.h>
+
 #include "para.h"
 #include "error.h"
 #include "list.h"
@@ -73,28 +76,19 @@ 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;
-	struct hostent *he;
-	struct sockaddr_in their_addr;
 
 	pcd->fd = -1;
-	ret = get_host_info(pcd->conf.hostname_arg, &he);
-	if (ret < 0)
-		return ret;
-	/* get new socket */
-	ret = get_stream_socket(AF_INET);
+	ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, pcd->conf.hostname_arg,
+						  pcd->conf.server_port_arg);
 	if (ret < 0)
 		return ret;
 	pcd->fd = ret;
-	/* init their_addr */
-	init_sockaddr(&their_addr, pcd->conf.server_port_arg, he);
-	ret = PARA_CONNECT(pcd->fd, &their_addr);
-	if (ret < 0)
-		goto err_out;
 	pcd->status = CL_CONNECTED;
-	ret = mark_fd_nonblock(pcd->fd);
+	ret = mark_fd_nonblocking(pcd->fd);
 	if (ret < 0)
 		goto err_out;
 	pcd->task.pre_select = client_pre_select;
@@ -231,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;
 			}
@@ -260,8 +254,8 @@ static ssize_t client_recv_buffer(struct private_client_data *pcd)
  * \param t pointer to the task struct for this command
  *
  * Depending on the current state of the connection and the status of the read
- * and write fd sets of \a s, this function performs the neccessary steps to
- * authenticate the connection, to send the commmand given by \a
+ * and write fd sets of \a s, this function performs the necessary steps to
+ * authenticate the connection, to send the command given by \a
  * t->private_data and to receive para_server's output, if any.
  *
  * \sa struct sched, struct task
@@ -381,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);