X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=93de2d2d99d9f75cb041211e8c4f45dfef28c6a1;hp=bde1458776856d26be371da2e309fb21354c5078;hb=3ea5399aeec092dcdb9f039288f1e146aadbb2f7;hpb=75695bba841fc43094ebc669418187080cea00e6

diff --git a/command.c b/command.c
index bde14587..93de2d2d 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)