X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client_common.c;h=b77c192f3a1c31bc0792fd427b39e21518c2fbd1;hb=b8bc24e242b088195249574bb90cda2e1ee1d9e4;hp=409c51df5973d51ec61f04091b322203c3c9a9e0;hpb=ef94bc193cdfc8076069ef1fa38cd21f5a3402e7;p=paraslash.git

diff --git a/client_common.c b/client_common.c
index 409c51df..b77c192f 100644
--- a/client_common.c
+++ b/client_common.c
@@ -50,8 +50,10 @@ void client_close(struct private_client_data *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);
@@ -129,13 +131,13 @@ void client_pre_select(struct sched *s, struct task *t)
 		pcd->check_w = 1;
 		return;
 
-	case CL_RECEIVING_SERVER_OUTPUT:
+	case CL_RECEIVING:
 		if (pcd->loaded < CLIENT_BUFSIZE - 1) {
 			para_fd_set(pcd->fd, &s->rfds, &s->max_fileno);
 			pcd->check_r = 1;
 		}
 		return;
-	case CL_SENDING_STDIN:
+	case CL_SENDING:
 		if (*pcd->in_loaded) {
 			PARA_INFO_LOG("loaded: %zd\n", *pcd->in_loaded);
 			para_fd_set(pcd->fd, &s->wfds, &s->max_fileno);
@@ -269,11 +271,11 @@ void client_post_select(struct sched *s, struct task *t)
 			return;
 		t->ret = -E_HANDSHAKE_COMPLETE;
 		if (strstr(pcd->buf, AWAITING_DATA_MSG))
-			pcd->status = CL_SENDING_STDIN;
+			pcd->status = CL_SENDING;
 		else
-			pcd->status = CL_RECEIVING_SERVER_OUTPUT;
+			pcd->status = CL_RECEIVING;
 		return;
-	case CL_SENDING_STDIN: /* FIXME: might block */
+	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) {
@@ -283,7 +285,7 @@ void client_post_select(struct sched *s, struct task *t)
 		}
 		*pcd->in_loaded = 0; /* FIXME: short writes */
 		return;
-	case CL_RECEIVING_SERVER_OUTPUT:
+	case CL_RECEIVING:
 		t->ret = client_recv_buffer(pcd);
 		return;
 	}