X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=f92ef5518cd507ea5e1ef6026e03f841f4b37e37;hp=e963da7760465af02bcceec58730be2be4be84fd;hb=1cccf6fa93c251f8f2805aa5fb163741d851c051;hpb=74c88020bd325865fe26ed25ea8ad0ace0924136

diff --git a/server.c b/server.c
index e963da77..f92ef551 100644
--- a/server.c
+++ b/server.c
@@ -8,10 +8,7 @@
 
 
 /**
- * \mainpage Paraslash API Reference
- *
- * Starting points for getting an overview:
- *
+ * \mainpage Starting points for getting an overview:
  *
  * 	- The main programs: \ref server.c, \ref audiod.c, \ref client.c,
  *	  \ref audioc.c, \ref afh.c, \ref play.c,
@@ -66,9 +63,15 @@
  *	- Forward error correction: \ref fec.c.
  */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <signal.h>
 #include <regex.h>
 #include <osl.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -91,6 +94,7 @@
 #include "signal.h"
 #include "user_list.h"
 #include "color.h"
+#include "ggo.h"
 #include "version.h"
 
 __printf_2_3 void (*para_log)(int, const char*, ...) = daemon_log;
@@ -236,13 +240,13 @@ void parse_config_or_die(int override)
 			.print_errors = !conf.daemon_given
 		};
 		server_cmdline_parser_config_file(cf, &conf, &params);
+		daemon_set_loglevel(conf.loglevel_arg);
 		conf.daemon_given = tmp;
 	}
 	if (conf.logfile_given) {
 		daemon_set_logfile(conf.logfile_arg);
 		daemon_open_log_or_die();
 	}
-	daemon_set_loglevel(conf.loglevel_arg);
 	init_colors_or_die();
 	daemon_set_flag(DF_LOG_PID);
 	daemon_set_flag(DF_LOG_LL);
@@ -338,7 +342,7 @@ static void init_signal_task(void)
 		*st = &signal_task_struct;
 
 	st->task.pre_select = signal_pre_select;
-	st->task.new_post_select = signal_post_select;
+	st->task.post_select = signal_post_select;
 	sprintf(st->task.status, "signal task");
 
 	PARA_NOTICE_LOG("setting up signal handling\n");
@@ -390,6 +394,9 @@ static int command_post_select(struct sched *s, struct task *t)
 		goto out;
 	}
 	if (child_pid) {
+		/* avoid problems with non-fork-safe PRNGs */
+		unsigned char buf[16];
+		get_random_bytes_or_die(buf, sizeof(buf));
 		close(new_fd);
 		/* parent keeps accepting connections */
 		return 0;
@@ -422,7 +429,7 @@ static void init_server_command_task(int argc, char **argv)
 
 	PARA_NOTICE_LOG("initializing tcp command socket\n");
 	sct->task.pre_select = command_pre_select;
-	sct->task.new_post_select = command_post_select;
+	sct->task.post_select = command_post_select;
 	sct->argc = argc;
 	sct->argv = argv;
 	ret = para_listen_simple(IPPROTO_TCP, conf.port_arg);
@@ -473,6 +480,15 @@ static int init_afs(int argc, char **argv)
 	return afs_server_socket[0];
 }
 
+__noreturn static void print_help_and_die(void)
+{
+	struct ggo_help h = DEFINE_GGO_HELP(server);
+	bool d = conf.detailed_help_given;
+
+	ggo_print_help(&h, d? GPH_STANDARD_FLAGS_DETAILED : GPH_STANDARD_FLAGS);
+	exit(0);
+}
+
 static void server_init(int argc, char **argv)
 {
 	struct server_cmdline_parser_params params = {
@@ -488,7 +504,10 @@ static void server_init(int argc, char **argv)
 	init_random_seed_or_die();
 	/* parse command line options */
 	server_cmdline_parser_ext(argc, argv, &conf, &params);
-	HANDLE_VERSION_FLAG("server", conf);
+	daemon_set_loglevel(conf.loglevel_arg);
+	version_handle_flag("server", conf.version_given);
+	if (conf.help_given || conf.detailed_help_given)
+		print_help_and_die();
 	drop_privileges_or_die(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
 	parse_config_or_die(0);