X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=12c8365661e6c8f7e0608c66cd7d65a659e219cb;hp=8bca7b7f04e237e4bfb0b477b828ae6678f9f2aa;hb=1b46ae4193cddb7d589b0f2f7d8158b84f7e9f6d;hpb=4c6dd71312400fc04b3f0582b23a0cff831ee8fa

diff --git a/client_common.c b/client_common.c
index 8bca7b7f..12c83656 100644
--- a/client_common.c
+++ b/client_common.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-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
@@ -48,18 +48,55 @@ void rc4_recv(unsigned long len, const unsigned char *indata,
 
 void client_close(struct private_client_data *pcd)
 {
-	if (pcd)
+	if (!pcd)
 		return;
-	if (pcd->fd >= 0)
+	if (pcd->fd >= 0) {
+		disable_crypt(pcd->fd);
 		close(pcd->fd);
+	}
 	free(pcd->user);
 	free(pcd->config_file);
 	free(pcd->key_file);
 	free(pcd);
 }
 
-int client_parse_config(int argc, char *argv[],
-		struct private_client_data **pcd_ptr)
+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();
+	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);
+	if (ret < 0)
+		goto err_out;
+	pcd->task.pre_select = client_pre_select;
+	pcd->task.post_select = client_post_select;
+	pcd->task.private_data = pcd;
+	sprintf(pcd->task.status, "client");
+	register_task(&pcd->task);
+	return 1;
+err_out:
+	close(pcd->fd);
+	pcd->fd = -1;
+	return ret;
+}
+
+int client_open(int argc, char *argv[], struct private_client_data **pcd_ptr)
 {
 	char *home = para_homedir();
 	struct stat statbuf;
@@ -67,9 +104,10 @@ int client_parse_config(int argc, char *argv[],
 	struct private_client_data *pcd =
 		para_calloc(sizeof(struct private_client_data));
 
+	*pcd_ptr = pcd;
 	pcd->fd = -1;
-	client_cmdline_parser(argc, argv, &pcd->conf);
-	ret = - E_CLIENT_SYNTAX;
+	ret = client_cmdline_parser(argc, argv, &pcd->conf);
+	ret = -E_CLIENT_SYNTAX;
 	if (!pcd->conf.inputs_num)
 		goto out;
 	pcd->user = pcd->conf.user_given?
@@ -91,16 +129,18 @@ int client_parse_config(int argc, char *argv[],
 		client_cmdline_parser_configfile(pcd->config_file,
 			&pcd->conf, 0, 0, 0);
 	ret = 1;
-	*pcd_ptr = pcd;
 	PARA_INFO_LOG("loglevel: %d\n", pcd->conf.loglevel_arg);
 	PARA_INFO_LOG("config_file: %s\n", pcd->config_file);
 	PARA_INFO_LOG("key_file: %s\n", pcd->key_file);
 	PARA_NOTICE_LOG("connecting %s:%d\n", pcd->conf.hostname_arg,
 		pcd->conf.server_port_arg);
+	ret = client_connect(pcd);
 out:
 	free(home);
-	if (ret < 0)
+	if (ret < 0) {
+		PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
 		client_close(pcd);
+	}
 	return ret;
 }
 
@@ -276,11 +316,8 @@ void client_post_select(struct sched *s, struct task *t)
 	case CL_SENDING: /* FIXME: might block */
 		PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
 		t->ret = send_bin_buffer(pcd->fd, pcd->inbuf, *pcd->in_loaded);
-		if (t->ret <= 0) {
-			if (!t->ret)
-				t->ret = 1;
+		if (t->ret < 0)
 			return;
-		}
 		*pcd->in_loaded = 0; /* FIXME: short writes */
 		return;
 	case CL_RECEIVING:
@@ -289,36 +326,3 @@ void client_post_select(struct sched *s, struct task *t)
 	}
 
 }
-
-int client_open(struct private_client_data *pcd)
-{
-	int ret;
-	struct hostent *he;
-	struct sockaddr_in their_addr;
-
-	ret = get_host_info(pcd->conf.hostname_arg, &he);
-	if (ret < 0)
-		goto out;
-	/* get new socket */
-	ret = get_socket();
-	if (ret < 0)
-		goto out;
-	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 out;
-	pcd->status = CL_CONNECTED;
-	ret = mark_fd_nonblock(pcd->fd);
-	if (ret < 0)
-		goto out;
-	pcd->task.pre_select = client_pre_select;
-	pcd->task.post_select = client_post_select;
-	pcd->task.private_data = pcd;
-	sprintf(pcd->task.status, "client");
-	register_task(&pcd->task);
-	ret = 1;
-out:
-	return ret;
-}