X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=70d9137e7073cf7e7c7e9d3e598c742a26657560;hp=57f0c26ee36e046e4390157f49352bb0e7fccf70;hb=a496f5831278c7e724d02de45f6cc6eba115b95c;hpb=24758c5f17064273786e704b84ceff56c234e347

diff --git a/server.c b/server.c
index 57f0c26e..70d9137e 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,
@@ -91,6 +88,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 +234,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);
@@ -278,13 +276,13 @@ static void handle_sighup(void)
 		kill(mmd->afs_pid, SIGHUP);
 }
 
-static void signal_post_select(struct sched *s, __a_unused struct task *t)
+static int signal_post_select(struct sched *s, __a_unused struct task *t)
 {
 	int signum = para_next_signal(&s->rfds);
 
 	switch (signum) {
 	case 0:
-		return;
+		return 0;
 	case SIGHUP:
 		handle_sighup();
 		break;
@@ -329,6 +327,7 @@ cleanup:
 		shm_detach(mmd);
 		exit(EXIT_FAILURE);
 	}
+	return 0;
 }
 
 static void init_signal_task(void)
@@ -357,7 +356,7 @@ static void command_pre_select(struct sched *s, struct task *t)
 	para_fd_set(sct->listen_fd, &s->rfds, &s->max_fileno);
 }
 
-static void command_post_select(struct sched *s, struct task *t)
+static int command_post_select(struct sched *s, struct task *t)
 {
 	struct server_command_task *sct = container_of(t, struct server_command_task, task);
 
@@ -389,9 +388,12 @@ static void 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;
+		return 0;
 	}
 	/* mmd might already have changed at this point */
 	free(chunk_table);
@@ -405,10 +407,12 @@ static void command_post_select(struct sched *s, struct task *t)
 	for (i = sct->argc - 1; i >= 0; i--)
 		memset(sct->argv[i], 0, strlen(sct->argv[i]));
 	sprintf(sct->argv[0], "para_server (serving %s)", peer_name);
-	return handle_connect(new_fd, peer_name);
+	handle_connect(new_fd, peer_name);
+	/* never reached*/
 out:
 	if (ret < 0)
 		PARA_CRIT_LOG("%s\n", para_strerror(-ret));
+	return 0;
 }
 
 static void init_server_command_task(int argc, char **argv)
@@ -470,6 +474,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 = {
@@ -485,7 +498,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);