X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=d08a71818cfb437c5cd6c02a13d6a7c2f3e56893;hp=9abe04a341f94520a3720167e6610f1940e9fb24;hb=46f2f102fa22ddffe515546e7db21cf208db0d90;hpb=002731cd3938f3be6b71651e56c062af1adcdec0

diff --git a/command.c b/command.c
index 9abe04a3..d08a7181 100644
--- a/command.c
+++ b/command.c
@@ -192,7 +192,7 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 	case SENDER_ALLOW:
 		if (argc != 4 && argc != 5)
 			return -E_COMMAND_SYNTAX;
-		if (!inet_pton(AF_INET, argv[3], &scd->addr))
+		if (!is_valid_ipv4_address(argv[3]))
 			return -E_COMMAND_SYNTAX;
 		scd->netmask = 32;
 		if (argc == 5) {
@@ -200,20 +200,13 @@ static int check_sender_args(int argc, char * const * argv, struct sender_comman
 			if (scd->netmask < 0 || scd->netmask > 32)
 				return -E_COMMAND_SYNTAX;
 		}
+		strncpy(scd->host, argv[3], sizeof(scd->host));
 		break;
 	case SENDER_ADD:
 	case SENDER_DELETE:
-		if (argc != 4 && argc != 5)
-			return -E_COMMAND_SYNTAX;
-		if (!inet_pton(AF_INET, argv[3], &scd->addr))
+		if (argc != 4)
 			return -E_COMMAND_SYNTAX;
-		scd->port = -1;
-		if (argc == 5) {
-			scd->port = atoi(argv[4]);
-			if (scd->port < 0 || scd->port > 65535)
-				return -E_COMMAND_SYNTAX;
-		}
-		break;
+		return parse_fec_url(argv[3], scd);
 	default:
 		return -E_COMMAND_SYNTAX;
 	}
@@ -254,7 +247,7 @@ int com_sender(int fd, int argc, char * const * argv)
 			usleep(100 * 1000);
 			continue;
 		}
-		mmd->sender_cmd_data = scd;
+		memcpy(&mmd->sender_cmd_data, &scd, sizeof(scd));
 		mutex_unlock(mmd_mutex);
 		break;
 	}
@@ -794,12 +787,14 @@ __noreturn void handle_connect(int fd, const char *peername)
 	/* valid command and sufficient perms */
 	alarm(0);
 	argc = split_args(command, &argv, "\n");
-	mutex_lock(mmd_mutex);
-	mmd->num_commands++;
-	mutex_unlock(mmd_mutex);
 	PARA_NOTICE_LOG("calling com_%s() for %s@%s\n", cmd->name, u->name,
 			peername);
 	ret = cmd->handler(fd, argc, argv);
+	mutex_lock(mmd_mutex);
+	mmd->num_commands++;
+	free(mmd->afd.afhi.info_string);
+	free(mmd->afd.afhi.chunk_table);
+	mutex_unlock(mmd_mutex);
 	if (ret >= 0)
 		goto out;
 err_out: