X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=3501a5df210409029ef954e5ddb4ebdc0b90561c;hp=1b53f705423556040736a4e70dbd8fc7460a38f2;hb=741dc05a35312034c8f1e20c5c08a6755812ba67;hpb=8dffec19598a4a0ed77fa082abaf52c8fe66d889

diff --git a/client_common.c b/client_common.c
index 1b53f705..3501a5df 100644
--- a/client_common.c
+++ b/client_common.c
@@ -6,7 +6,11 @@
 
 /** \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"
 #include "sched.h"
 #include "client.cmdline.h"
@@ -17,7 +21,6 @@
 #include "string.h"
 #include "client.cmdline.h"
 #include "client.h"
-#include "error.h"
 
 /*
  * rc4 encrypt data before sending
@@ -76,25 +79,15 @@ void client_close(struct private_client_data *pcd)
 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_socket();
+	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 +224,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 +253,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