X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=audiod.c;h=bd32ad387fd7ee2d6c9816a4a7603354a572fa1f;hb=823a4ff87a03ff9e1d2bfe8bc501f55ee4213649;hp=ddbe9d8bfb58550deb89cb771815362af7a1f78b;hpb=67d6243694e36deb43eb8bf246871d3e266b1cb2;p=paraslash.git

diff --git a/audiod.c b/audiod.c
index ddbe9d8b..bd32ad38 100644
--- a/audiod.c
+++ b/audiod.c
@@ -5,8 +5,14 @@
  */
 
 /** \file audiod.c The paraslash's audio daemon. */
+
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 #include <signal.h>
 
 #include "para.h"
@@ -649,8 +655,6 @@ static void compute_time_diff(const struct timeval *status_time)
 	const struct timeval max_deviation = {0, 500 * 1000};
 	const int time_smooth = 5;
 
-	if (!status_time)
-		return;
 	sign = tv_diff(status_time, now, &diff);
 //		PARA_NOTICE_LOG("%s: sign = %i, sa_time_diff_sign = %i\n", __func__,
 //			sign, sa_time_diff_sign);
@@ -1149,13 +1153,10 @@ static void close_unused_slots(void)
  */
 void __noreturn clean_exit(int status, const char *msg)
 {
-	int i;
-
 	if (socket_name)
 		unlink(socket_name);
 	close_stat_pipe();
-	FOR_EACH_SLOT(i)
-		close_slot(i);
+	close_unused_slots();
 	audiod_cmdline_parser_free(&conf);
 	close_stat_clients();
 	PARA_EMERG_LOG("%s\n", msg);
@@ -1391,7 +1392,7 @@ int main(int argc, char *argv[])
 	writer_init();
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
-	drop_privileges_or_die(conf.user_arg, conf.group_arg);
+	daemon_drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	parse_config_or_die();
 	init_colors_or_die();
 	init_random_seed_or_die();
@@ -1409,8 +1410,8 @@ int main(int argc, char *argv[])
 		PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 		exit(EXIT_FAILURE);
 	}
-	log_welcome("para_audiod");
-	set_server_start_time(NULL);
+	daemon_log_welcome("para_audiod");
+	daemon_set_start_time();
 	set_initial_status();
 	FOR_EACH_SLOT(i)
 		clear_slot(i);