X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=client_common.c;h=eea7510fd0589e86fb4058dd7f4361f3c79901aa;hp=094b93be85addc7882a1bfc8d65110ce128ec215;hb=refs%2Fheads%2Fmaint;hpb=8919784065fdfd210dc25e4ab31c6fa92f9e3219

diff --git a/client_common.c b/client_common.c
index 094b93be..c25da96b 100644
--- a/client_common.c
+++ b/client_common.c
@@ -50,13 +50,12 @@ void client_close(struct client_task *ct)
 }
 
 /*
- * The preselect hook for server commands.
+ * This function asks the scheduler to monitor a file descriptor which
+ * corresponds to an active connection. The descriptor is monitored for either
+ * reading or writing, depending on the state of the connection.
  *
- * The task pointer must contain a pointer to the initialized client data
- * structure as it is returned by client_open().
- *
- * This function checks the state of the connection and adds the file descriptor
- * of the connection to the read or write fd set of s accordingly.
+ * 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)
 {
@@ -86,7 +85,7 @@ static void client_pre_select(struct sched *s, void *context)
 			else if (ret > 0)
 				para_fd_set(ct->scc.fd, &s->wfds, &s->max_fileno);
 		}
-		/* fallthrough */
+		__attribute__ ((fallthrough));
 	case CL_EXECUTING:
 		if (ct->btrn[0]) {
 			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);
@@ -260,12 +259,15 @@ static int send_sb_command(struct client_task *ct)
 }
 
 /*
- * The post select hook for client commands.
+ * This function reads or writes to the socket file descriptor which
+ * corresponds to an established connection between the client and the server.
+ * It depends on the current state of the connection and on the readiness of
+ * the socket file descriptor which type of I/O is going to be performed.
+ * Besides the initial handshake and authentication, the function sends the
+ * server command and receives the output from the server, if any.
  *
- * Depending on the current state of the connection and the status of the read
- * and write fd sets of s, this function performs the necessary steps to
- * authenticate the connection, to send the command given by t->private_data
- * and to receive para_server's output, if any.
+ * 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)
 {
@@ -318,15 +320,15 @@ static int client_post_select(struct sched *s, void *context)
 		}
 		n = sbb.iov.iov_len;
 		PARA_INFO_LOG("<-- [challenge] (%zu bytes)\n", n);
-		ret = priv_decrypt(ct->key_file, crypt_buf,
+		ret = apc_priv_decrypt(ct->key_file, crypt_buf,
 			sbb.iov.iov_base, n);
 		free(sbb.iov.iov_base);
 		if (ret < 0)
 			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);
-		ct->scc.recv = sc_new(crypt_buf + CHALLENGE_SIZE + SESSION_KEY_LEN,
+		hash_function((char *)crypt_buf, APC_CHALLENGE_SIZE, ct->challenge_hash);
+		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);
 		hash_to_asc(ct->challenge_hash, buf);
 		PARA_INFO_LOG("--> %s\n", buf);
@@ -389,7 +391,7 @@ static int client_post_select(struct sched *s, void *context)
 					btr_consume(ct->btrn[1], sz);
 			}
 		}
-		/* fall through */
+		__attribute__ ((fallthrough));
 	case CL_EXECUTING:
 		if (ct->btrn[0]) {
 			ret = btr_node_status(ct->btrn[0], 0, BTR_NT_ROOT);