X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=6777ccc971e2590bd2d46879ba428ff1f327f7d8;hp=bde1458776856d26be371da2e309fb21354c5078;hb=884f36e554f9c58815bc24cc3f1f033ab30cb7c7;hpb=b184fbf41abbdd68ee148ea4dc6fc2969f05e87b

diff --git a/command.c b/command.c
index bde14587..6777ccc9 100644
--- a/command.c
+++ b/command.c
@@ -161,9 +161,8 @@ static unsigned get_status(struct misc_meta_data *nmmd, int parser_friendly,
 static int check_sender_args(int argc, char * const * argv, struct sender_command_data *scd)
 {
 	int i;
-	/* this has to match sender.h */
-	const char *subcmds[] = {"add", "delete", "allow", "deny", "on", "off", NULL};
 
+	const char *subcmds[] = {SENDER_SUBCOMMANDS NULL};
 	scd->sender_num = -1;
 	if (argc < 3)
 		return -E_COMMAND_SYNTAX;
@@ -183,19 +182,19 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 	if (!senders[scd->sender_num].client_cmds[scd->cmd_num])
 		return -E_SENDER_CMD;
 	switch (scd->cmd_num) {
-	case SENDER_ON:
-	case SENDER_OFF:
+	case SENDER_on:
+	case SENDER_off:
 		if (argc != 3)
 			return -E_COMMAND_SYNTAX;
 		break;
-	case SENDER_DENY:
-	case SENDER_ALLOW:
+	case SENDER_deny:
+	case SENDER_allow:
 		if (argc != 4 || parse_cidr(argv[3], scd->host,
 				sizeof(scd->host), &scd->netmask) == NULL)
 			return -E_COMMAND_SYNTAX;
 		break;
-	case SENDER_ADD:
-	case SENDER_DELETE:
+	case SENDER_add:
+	case SENDER_delete:
 		if (argc != 4)
 			return -E_COMMAND_SYNTAX;
 		return parse_fec_url(argv[3], scd);
@@ -358,8 +357,8 @@ static int com_sender(struct command_context *cc)
 	}
 
 	switch (scd.cmd_num) {
-	case SENDER_ADD:
-	case SENDER_DELETE:
+	case SENDER_add:
+	case SENDER_delete:
 		assert(senders[scd.sender_num].resolve_target);
 		ret = senders[scd.sender_num].resolve_target(cc->argv[3], &scd);
 		if (ret < 0)
@@ -474,7 +473,7 @@ static unsigned empty_status_items(int parser_friendly, char **result)
 			#define ITEM(x) "0004 %02x:\n"
 			EMPTY_STATUS_ITEMS
 			#undef ITEM
-			#define ITEM(x) , SI_ ## x
+			#define ITEM(x) , (unsigned) SI_ ## x
 			EMPTY_STATUS_ITEMS
 			#undef ITEM
 		);
@@ -729,6 +728,7 @@ static int com_ff(struct command_context *cc)
 	ret = -E_NO_AUDIO_FILE;
 	if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
 		goto out;
+	ret = 1;
 	promille = (1000 * mmd->current_chunk) / mmd->afd.afhi.chunks_total;
 	if (backwards)
 		promille -= 1000 * i / mmd->afd.afhi.seconds_total;
@@ -744,7 +744,6 @@ static int com_ff(struct command_context *cc)
 	mmd->new_vss_status_flags |= VSS_REPOS;
 	mmd->new_vss_status_flags &= ~VSS_NEXT;
 	mmd->events++;
-	ret = 1;
 out:
 	mutex_unlock(mmd_mutex);
 	return ret;
@@ -768,7 +767,7 @@ static int com_jmp(struct command_context *cc)
 		i = 100;
 	PARA_INFO_LOG("jumping to %lu%%\n", i);
 	mmd->repos_request = (mmd->afd.afhi.chunks_total * i + 50) / 100;
-	PARA_INFO_LOG("sent: %lu, offset before jmp: %lu\n",
+	PARA_INFO_LOG("sent: %lu, offset before jmp: %li\n",
 		mmd->chunks_sent, mmd->offset);
 	mmd->new_vss_status_flags |= VSS_REPOS;
 	mmd->new_vss_status_flags &= ~VSS_NEXT;
@@ -808,7 +807,6 @@ static void reset_signals(void)
 }
 
 struct connection_features {
-	bool sideband_requested;
 	bool aes_ctr128_requested;
 };
 
@@ -836,8 +834,8 @@ static int parse_auth_request(char *buf, int len, struct user **u,
 		create_argv(p, ",", &features);
 		for (i = 0; features[i]; i++) {
 			if (strcmp(features[i], "sideband") == 0)
-				cf->sideband_requested = true;
-			else if (strcmp(features[i], "aes_ctr128") == 0)
+				continue;
+			if (strcmp(features[i], "aes_ctr128") == 0)
 				cf->aes_ctr128_requested = true;
 			else {
 				ret = -E_BAD_FEATURE;
@@ -950,11 +948,6 @@ __noreturn void handle_connect(int fd, const char *peername)
 	ret = parse_auth_request(buf, ret, &cc->u, &cf);
 	if (ret < 0)
 		goto net_err;
-	if (!cf.sideband_requested) { /* sideband is mandatory */
-		PARA_ERROR_LOG("client did not request sideband\n");
-		ret = -E_BAD_FEATURE;
-		goto net_err;
-	}
 	if (cc->u) {
 		get_random_bytes_or_die(rand_buf, sizeof(rand_buf));
 		ret = pub_encrypt(cc->u->pubkey, rand_buf, sizeof(rand_buf),
@@ -971,7 +964,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 		numbytes = 256;
 		get_random_bytes_or_die((unsigned char *)buf, numbytes);
 	}
-	PARA_DEBUG_LOG("sending %u byte challenge + session key (%zu bytes)\n",
+	PARA_DEBUG_LOG("sending %d byte challenge + session key (%zu bytes)\n",
 		CHALLENGE_SIZE, numbytes);
 	ret = send_sb(&cc->scc, buf, numbytes, SBD_CHALLENGE, false);
 	buf = NULL;