X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=client_common.c;h=fe8234f98fe90f6ce74ea5e22699fbfc0059a042;hb=2934ee80367ee9d50b99ed8d7f672d1a397b4ce0;hp=7a353098c42ecfab3f36452b9e82d4a4a8637c32;hpb=181beb316afad036ac01a778544c5dec0a8d51c7;p=paraslash.git

diff --git a/client_common.c b/client_common.c
index 7a353098..fe8234f9 100644
--- a/client_common.c
+++ b/client_common.c
@@ -57,7 +57,7 @@ void client_close(struct client_task *ct)
  * The context pointer is assumed to refer to a client task structure that was
  * initialized earlier by client_open().
  */
-static void client_pre_select(struct sched *s, void *context)
+static void client_pre_monitor(struct sched *s, void *context)
 {
 	int ret;
 	struct client_task *ct = context;
@@ -68,13 +68,13 @@ static void client_pre_select(struct sched *s, void *context)
 	case CL_CONNECTED:
 	case CL_SENT_AUTH:
 	case CL_SENT_CH_RESPONSE:
-		para_fd_set(ct->scc.fd, &s->rfds, &s->max_fileno);
+		sched_monitor_readfd(ct->scc.fd, s);
 		return;
 
 	case CL_RECEIVED_WELCOME:
 	case CL_RECEIVED_PROCEED:
 	case CL_RECEIVED_CHALLENGE:
-		para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
+		sched_monitor_writefd(ct->scc.fd, s);
 		return;
 
 	case CL_SENDING:
@@ -83,7 +83,7 @@ static void client_pre_select(struct sched *s, void *context)
 			if (ret < 0)
 				sched_min_delay(s);
 			else if (ret > 0)
-				para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
+				sched_monitor_writefd(ct->scc.fd, s);
 		}
 		__attribute__ ((fallthrough));
 	case CL_EXECUTING:
@@ -92,7 +92,7 @@ static void client_pre_select(struct sched *s, void *context)
 			if (ret < 0)
 				sched_min_delay(s);
 			else if (ret > 0)
-				para_fd_set(ct->scc.fd, &s->rfds, &s->max_fileno);
+				sched_monitor_readfd(ct->scc.fd, s);
 		}
 		return;
 	}
@@ -245,7 +245,7 @@ static int send_sb_command(struct client_task *ct)
 
 	for (i = 0; i < num_inputs; i++)
 		len += strlen(lls_input(i, ct->lpr)) + 1;
-	p = command = para_malloc(len);
+	p = command = alloc(len);
 	for (i = 0; i < num_inputs; i++) {
 		const char *str = lls_input(i, ct->lpr);
 		strcpy(p, str);
@@ -255,9 +255,15 @@ static int send_sb_command(struct client_task *ct)
 	return send_sb(ct, 0, command, len, SBD_COMMAND, false);
 }
 
+/* Find out if the given string is contained in the features vector. */
 static bool has_feature(const char *feature, struct client_task *ct)
 {
-	return find_arg(feature, ct->features) >= 0? true : false;
+	if (!ct->features)
+		return false;
+	for (int i = 0; ct->features[i]; i++)
+		if (strcmp(feature, ct->features[i]) == 0)
+			return true;
+	return false;
 }
 
 /*
@@ -271,7 +277,7 @@ static bool has_feature(const char *feature, struct client_task *ct)
  * The context pointer refers to a client task structure that was initialized
  * earlier by client_open().
  */
-static int client_post_select(struct sched *s, void *context)
+static int client_post_monitor(struct sched *s, void *context)
 {
 	struct client_task *ct = context;
 	int ret = 0;
@@ -336,18 +342,20 @@ static int client_post_select(struct sched *s, void *context)
 		free(sbb.iov.iov_base);
 		if (ret < 0)
 			goto out;
-		ct->challenge_hash = para_malloc(HASH2_SIZE);
-
+		ct->challenge_hash = alloc(HASH2_SIZE);
 		if (has_feature("sha256", ct)) {
-			hash2_function((char *)crypt_buf, APC_CHALLENGE_SIZE, ct->challenge_hash);
+			hash2_function((char *)crypt_buf, APC_CHALLENGE_SIZE,
+				ct->challenge_hash);
 			hash2_to_asc(ct->challenge_hash, buf);
 		} else {
-			hash_function((char *)crypt_buf, APC_CHALLENGE_SIZE, ct->challenge_hash);
+			hash_function((char *)crypt_buf, APC_CHALLENGE_SIZE,
+				ct->challenge_hash);
 			hash_to_asc(ct->challenge_hash, buf);
 		}
-		ct->scc.send = sc_new(crypt_buf + APC_CHALLENGE_SIZE, SESSION_KEY_LEN);
-		ct->scc.recv = sc_new(crypt_buf + APC_CHALLENGE_SIZE + SESSION_KEY_LEN,
-			SESSION_KEY_LEN);
+		ct->scc.send = sc_new(crypt_buf + APC_CHALLENGE_SIZE,
+			 SESSION_KEY_LEN);
+		ct->scc.recv = sc_new(crypt_buf + APC_CHALLENGE_SIZE
+			+ SESSION_KEY_LEN, SESSION_KEY_LEN);
 		PARA_INFO_LOG("--> %s\n", buf);
 		ct->status = CL_RECEIVED_CHALLENGE;
 		return 0;
@@ -393,12 +401,12 @@ static int client_post_select(struct sched *s, void *context)
 			char *buf2;
 			size_t sz;
 			ret = btr_node_status(ct->btrn[1], 0, BTR_NT_LEAF);
-			if (ret == -E_BTR_EOF) {
+			if (ret == -E_EOF) {
 				/* empty blob data packet indicates EOF */
 				PARA_INFO_LOG("blob sent\n");
 				ret = send_sb(ct, 1, NULL, 0, SBD_BLOB_DATA, true);
 				if (ret >= 0)
-					ret = -E_BTR_EOF;
+					ret = -E_EOF;
 			}
 			if (ret < 0)
 				goto close1;
@@ -485,7 +493,7 @@ int client_connect(struct client_task *ct, struct sched *s,
 
 	PARA_NOTICE_LOG("connecting %s:%u\n", host, port);
 	ct->scc.fd = -1;
-	ret = para_connect_simple(IPPROTO_TCP, host, port);
+	ret = para_connect(IPPROTO_TCP, host, port);
 	if (ret < 0)
 		return ret;
 	ct->scc.fd = ret;
@@ -500,8 +508,8 @@ int client_connect(struct client_task *ct, struct sched *s,
 
 	ct->task = task_register(&(struct task_info) {
 		.name = "client",
-		.pre_select = client_pre_select,
-		.post_select = client_post_select,
+		.pre_monitor = client_pre_monitor,
+		.post_monitor = client_post_monitor,
 		.context = ct,
 	}, s);
 	return 1;
@@ -573,8 +581,9 @@ int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr,
 	if (CLIENT_OPT_GIVEN(KEY_FILE, lpr))
 		kf = para_strdup(CLIENT_OPT_STRING_VAL(KEY_FILE, lpr));
 	else {
+		struct stat statbuf;
 		kf = make_message("%s/.paraslash/key.%s", home, user);
-		if (!file_exists(kf)) {
+		if (stat(kf, &statbuf) != 0) { /* assume file does not exist */
 			free(kf);
 			kf = make_message("%s/.ssh/id_rsa", home);
 		}
@@ -582,7 +591,7 @@ int client_parse_config(int argc, char *argv[], struct client_task **ct_ptr,
 	PARA_INFO_LOG("user: %s\n", user);
 	PARA_INFO_LOG("key file: %s\n", kf);
 	PARA_INFO_LOG("loglevel: %d\n", ll);
-	ct = para_calloc(sizeof(*ct));
+	ct = zalloc(sizeof(*ct));
 	ct->scc.fd = -1;
 	ct->lpr = lpr;
 	ct->key_file = kf;