X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=8ea725de7898ef817a62c0ba2755c73a0f744572;hp=857d77f3e6477642b8e2651749e84afe095a1bd7;hb=3685a9093ae12ff9ce02fc58e607eb9b63894443;hpb=543dce1f349397beb941187cd3041647851445a7

diff --git a/command.c b/command.c
index 857d77f3..8ea725de 100644
--- a/command.c
+++ b/command.c
@@ -279,7 +279,7 @@ static int check_sender_args(struct command_context *cc,
 }
 
 /**
- * Send a sideband packet through a blocking file descriptor.
+ * Receive a sideband packet from a blocking file descriptor.
  *
  * \param scc fd and crypto keys.
  * \param expected_band The expected band designator.
@@ -457,6 +457,7 @@ EXPORT_SERVER_CMD_HANDLER(version);
 	ITEM(chunk_time) \
 	ITEM(num_chunks) \
 	ITEM(amplification) \
+	ITEM(play_time) \
 
 /*
  * Create a set of audio-file related status items with empty values. These are
@@ -671,10 +672,22 @@ static int com_ff(struct command_context *cc, struct lls_parse_result *lpr)
 		send_errctx(cc, errctx);
 		return ret;
 	}
-	if (!(ret = sscanf(lls_input(0, lpr), "%i%c", &i, &c)))
-		return -E_COMMAND_SYNTAX;
-	if (ret > 1 && c == '-')
-		i = -i;
+	ret = para_atoi32(lls_input(0, lpr), &i);
+	if (ret < 0) {
+		if (ret != -E_ATOI_JUNK_AT_END)
+			return ret;
+		/*
+		 * Compatibility code to keep the historic syntax (ff 30-)
+		 * working. This can be removed after 0.7.0.
+		 */
+		ret = sscanf(lls_input(0, lpr), "%i%c", &i, &c);
+		if (ret <= 0)
+			return -E_COMMAND_SYNTAX;
+		if (ret > 1 && c == '-') {
+			PARA_WARNING_LOG("use of obsolete syntax\n");
+			i = -i;
+		}
+	}
 	mutex_lock(mmd_mutex);
 	ret = -E_NO_AUDIO_FILE;
 	if (!mmd->afd.afhi.chunks_total || !mmd->afd.afhi.seconds_total)
@@ -857,19 +870,19 @@ static int run_command(struct command_context *cc, struct iovec *iov)
  * Whenever para_server accepts an incoming tcp connection on the port it
  * listens on, it forks and the resulting child calls this function.
  *
- * An RSA-based challenge/response is used to authenticate the peer. It that
+ * An RSA-based challenge/response is used to authenticate the peer. If the
  * authentication succeeds, a random session key is generated and sent back to
  * the peer, encrypted with its RSA public key. From this point on, all
- * transfers are crypted with this session key.
+ * transfers are encrypted with this session key using a stream cipher.
  *
  * Next it is checked if the peer supplied a valid server command or a command
  * for the audio file selector. If yes, and if the user has sufficient
- * permissions to execute that command, the function calls the corresponding
- * command handler which does argument checking and further processing.
+ * permissions to execute this command, the function calls the corresponding
+ * command handler which performs argument checking and further processing.
  *
- * In order to cope with DOS attacks, a timeout is set up which terminates
- * the function if the connection was not authenticated when the timeout
- * expires.
+ * To cope with DOS attacks, a timer is set up right after the fork. If the
+ * connection was still not authenticated when the timeout expires, the child
+ * process is terminated.
  *
  * \return Standard.
  *