X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=79ca3652040188010dbbf2209fbf8ffe5757db50;hp=f9bace34146e28ccaf7b0632e0fa34ede51de8aa;hb=4d1c0335fbdb9b429c506eeec291c229b10aa2b8;hpb=452920e64da3451578bb2b1244bb982993b3a278

diff --git a/command.c b/command.c
index f9bace34..79ca3652 100644
--- a/command.c
+++ b/command.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -8,7 +8,6 @@
 
 #include <regex.h>
 #include <signal.h>
-#include <sys/time.h>
 #include <sys/types.h>
 #include <osl.h>
 
@@ -124,7 +123,7 @@ static unsigned get_status(struct misc_meta_data *nmmd, int parser_friendly,
 		localtime_r(&nmmd->mtime, &mtime_tm);
 		strftime(mtime, 29, "%b %d %Y", &mtime_tm);
 	}
-	gettimeofday(&current_time, NULL);
+	clock_get_realtime(&current_time);
 	/*
 	 * The calls to WRITE_STATUS_ITEM() below never fail because
 	 * b->max_size is zero (unlimited), see para_printf(). However, clang
@@ -259,6 +258,14 @@ __printf_3_4 int send_sb_va(struct stream_cipher_context *scc, int band,
 	return send_sb(scc, msg, ret, band, false);
 }
 
+/**
+ * Send an error message to a client.
+ *
+ * \param cc Client info.
+ * \param err The (positive) error code.
+ *
+ * \return The return value of the underlying call to send_sb_va().
+ */
 int send_strerror(struct command_context *cc, int err)
 {
 	return cc->use_sideband?
@@ -388,7 +395,8 @@ static int com_si(struct command_context *cc)
 		free(info);
 	}
 	ut = get_server_uptime_str(now);
-	ret = xasprintf(&msg, "version: " GIT_VERSION "\n"
+	ret = xasprintf(&msg,
+		"version: %s\n"
 		"up: %s\nplayed: %u\n"
 		"server_pid: %d\n"
 		"afs_pid: %d\n"
@@ -396,6 +404,7 @@ static int com_si(struct command_context *cc)
 		"current loglevel: %s\n"
 		"supported audio formats: %s\n"
 		"%s",
+		version_git(),
 		ut, mmd->num_played,
 		(int)getppid(),
 		(int)mmd->afs_pid,
@@ -403,7 +412,7 @@ static int com_si(struct command_context *cc)
 		mmd->num_commands,
 		mmd->num_connects,
 		conf.loglevel_arg,
-		SERVER_AUDIO_FORMATS,
+		AUDIO_FORMAT_HANDLERS,
 		sender_info
 	);
 	mutex_unlock(mmd_mutex);
@@ -424,11 +433,9 @@ static int com_version(struct command_context *cc)
 
 	if (cc->argc != 1)
 		return -E_COMMAND_SYNTAX;
-	msg = VERSION_TEXT("server") "built: " BUILD_DATE "\n" UNAME_RS
-		", " CC_VERSION "\n";
-	len = strlen(msg);
+	len = xasprintf(&msg, "%s", version_text("server"));
 	if (cc->use_sideband)
-		return send_sb(&cc->scc, msg, len, SBD_OUTPUT, true);
+		return send_sb(&cc->scc, msg, len, SBD_OUTPUT, false);
 	return sc_send_bin_buffer(&cc->scc, msg, len);
 }
 
@@ -984,7 +991,7 @@ __noreturn void handle_connect(int fd, const char *peername)
 	/* send Welcome message */
 	ret = write_va_buffer(fd, "This is para_server, version "
 		PACKAGE_VERSION  ".\n"
-		"Features: sideband,foo\n"
+		"Features: sideband\n"
 	);
 	if (ret < 0)
 		goto net_err;