X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=8212abb1d611dcff88889fa70629fcdc9f6eb5cf;hp=c426d6ed081e2016cd16f03fec867d42331938db;hb=2b8250e7d8b4bb34727470ee208fc9b725371bec;hpb=027f2c1237051d2d569d6be7f381c886f659bac3

diff --git a/client_common.c b/client_common.c
index c426d6ed..8212abb1 100644
--- a/client_common.c
+++ b/client_common.c
@@ -6,8 +6,13 @@
 
 /** \file client_common.c Common functions of para_client and para_audiod. */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -27,44 +32,17 @@
 /** The size of the receiving buffer. */
 #define CLIENT_BUFSIZE 4000
 
-/**
- * Close the connection to para_server and deallocate per-command resources.
- *
- * \param ct The client task.
- *
- * This frees all resources of the current command but keeps the configuration
- * in \p ct->conf.
- *
- * \sa \ref client_close().
- */
-void client_disconnect(struct client_task *ct)
-{
-	if (!ct)
-		return;
-	if (ct->scc.fd >= 0)
-		close(ct->scc.fd);
-	free_argv(ct->features);
-	ct->features = NULL;
-	sc_free(ct->scc.recv);
-	ct->scc.recv = NULL;
-	sc_free(ct->scc.send);
-	ct->scc.send = NULL;
-	btr_remove_node(&ct->btrn[0]);
-	btr_remove_node(&ct->btrn[1]);
-}
-
 /**
  * Close the connection to para_server and free all resources.
  *
  * \param ct Pointer to the client data.
  *
- * \sa \ref client_open(), \ref client_disconnect().
+ * \sa \ref client_open().
  */
 void client_close(struct client_task *ct)
 {
 	if (!ct)
 		return;
-	client_disconnect(ct);
 	free(ct->user);
 	free(ct->config_file);
 	free(ct->key_file);
@@ -331,7 +309,8 @@ static int client_post_select(struct sched *s, struct task *t)
 	case CL_RECEIVED_WELCOME: /* send auth command */
 		if (!FD_ISSET(ct->scc.fd, &s->wfds))
 			return 0;
-		sprintf(buf, AUTH_REQUEST_MSG "%s sideband", ct->user);
+		sprintf(buf, AUTH_REQUEST_MSG "%s sideband%s", ct->user,
+			has_feature("aes_ctr128", ct)? ",aes_ctr128" : "");
 		PARA_INFO_LOG("--> %s\n", buf);
 		ret = write_buffer(ct->scc.fd, buf);
 		if (ret < 0)
@@ -347,6 +326,7 @@ static int client_post_select(struct sched *s, struct task *t)
 		/* decrypted challenge/session key buffer */
 		unsigned char crypt_buf[1024];
 		struct sb_buffer sbb;
+		bool use_aes;
 
 		ret = recv_sb(ct, &s->rfds, &sbb);
 		if (ret <= 0)
@@ -365,9 +345,10 @@ static int client_post_select(struct sched *s, struct task *t)
 			goto out;
 		ct->challenge_hash = para_malloc(HASH_SIZE);
 		hash_function((char *)crypt_buf, CHALLENGE_SIZE, ct->challenge_hash);
-		ct->scc.send = sc_new(crypt_buf + CHALLENGE_SIZE, SESSION_KEY_LEN);
+		use_aes = has_feature("aes_ctr128", ct);
+		ct->scc.send = sc_new(crypt_buf + CHALLENGE_SIZE, SESSION_KEY_LEN, use_aes);
 		ct->scc.recv = sc_new(crypt_buf + CHALLENGE_SIZE + SESSION_KEY_LEN,
-			SESSION_KEY_LEN);
+			SESSION_KEY_LEN, use_aes);
 		hash_to_asc(ct->challenge_hash, buf);
 		PARA_INFO_LOG("--> %s\n", buf);
 		ct->status = CL_RECEIVED_CHALLENGE;
@@ -468,6 +449,16 @@ out:
 	btr_remove_node(&ct->btrn[1]);
 	if (ret != -E_SERVER_CMD_SUCCESS && ret != -E_SERVER_CMD_FAILURE)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+	if (ct->scc.fd >= 0) {
+		close(ct->scc.fd);
+		ct->scc.fd = -1;
+	}
+	free_argv(ct->features);
+	ct->features = NULL;
+	sc_free(ct->scc.recv);
+	ct->scc.recv = NULL;
+	sc_free(ct->scc.send);
+	ct->scc.send = NULL;
 	return ret;
 }