X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=6195266bb8f87ca168c410c44aef5dfac18586b4;hp=2f66dc4da17833b2ac32464746645e978d8752c8;hb=883af7d8af543616fe4ca09b0273dd4f59848779;hpb=d7cda933daa35663b2b9b61d62cb514afa37fd18

diff --git a/server.c b/server.c
index 2f66dc4d..6195266b 100644
--- a/server.c
+++ b/server.c
@@ -42,6 +42,8 @@
 #include "string.h"
 #include "ipc.h"
 #include "fd.h"
+#include "signal.h"
+#include "user_list.h"
 
 /** define the array of error lists needed by para_server */
 INIT_SERVER_ERRLISTS;
@@ -56,13 +58,13 @@ struct misc_meta_data *mmd;
  * It also contains the options for all audio file selectors and all supported
  * senders.
 */
-struct gengetopt_args_info conf;
-char *user_list = NULL;
+struct server_args_info conf;
+char *user_list_file = NULL;
 extern void dccp_send_init(struct sender *);
 extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);
-extern struct audio_format afl[];
 
+/* TODO: This is better handled by autoconf */
 /** the list of supported audio file selectors */
 struct audio_file_selector selectors[] = {
 	{
@@ -135,15 +137,7 @@ void para_log(int ll, const char* fmt,...)
 
 	if (ll < conf.loglevel_arg)
 		return;
-	if (!logfile) {
-		if (ll < WARNING)
-			outfd = stdout;
-		else
-			outfd = stderr;
-	} else
-		outfd = logfile;
-	if (conf.daemon_given && !logfile)
-		return;
+	outfd = logfile? logfile : stderr;
 	time(&t1);
 	tm = localtime(&t1);
 	strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
@@ -229,11 +223,11 @@ static void parse_config(int override)
 		cf = conf.config_file_arg;
 	else
 		cf = make_message("%s/.paraslash/server.conf", home);
-	free(user_list);
+	free(user_list_file);
 	if (!conf.user_list_given)
-		user_list = make_message("%s/.paraslash/server.users", home);
+		user_list_file = make_message("%s/.paraslash/server.users", home);
 	else
-		user_list = para_strdup(conf.user_list_arg);
+		user_list_file = para_strdup(conf.user_list_arg);
 	ret = stat(cf, &statbuf);
 	if (ret && conf.config_file_given) {
 		ret = -1;
@@ -242,7 +236,7 @@ static void parse_config(int override)
 	}
 	if (!ret) {
 		int tmp = conf.daemon_given;
-		cmdline_parser_configfile(cf, &conf, override, 0, 0);
+		server_cmdline_parser_configfile(cf, &conf, override, 0, 0);
 		conf.daemon_given = tmp;
 	}
 	/* logfile */
@@ -259,8 +253,8 @@ out:
 	free(home);
 	if (ret > 0)
 		return;
-	free(user_list);
-	user_list = NULL;
+	free(user_list_file);
+	user_list_file = NULL;
 	exit(EXIT_FAILURE);
 }
 
@@ -269,7 +263,6 @@ static void setup_signal_handling(void)
 	int ret = 0;
 
 	signal_pipe = para_signal_init();
-//	fcntl(signal_pipe, F_SETFL, O_NONBLOCK);
 	PARA_NOTICE_LOG("%s", "setting up signal handlers\n");
 	ret += para_install_sighandler(SIGINT);
 	ret += para_install_sighandler(SIGTERM);
@@ -311,11 +304,18 @@ random:
 
 static unsigned init_network(void)
 {
-	int sockfd = init_tcp_socket(conf.port_arg);
+	int fd, ret = init_tcp_socket(conf.port_arg);
 
-	if (sockfd < 0)
-		exit(EXIT_FAILURE);
-	return sockfd;
+	if (ret < 0)
+		goto err;
+	fd = ret;
+	ret = mark_fd_nonblock(fd);
+	if (ret < 0)
+		goto err;
+	return fd;
+err:
+	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+	exit(EXIT_FAILURE);
 }
 
 static void init_random_seed(void)
@@ -348,13 +348,14 @@ static unsigned do_inits(int argc, char **argv)
 
 	init_random_seed();
 	/* parse command line options */
-	cmdline_parser(argc, argv, &conf);
-	para_drop_privileges(conf.user_arg);
+	server_cmdline_parser(argc, argv, &conf);
+	para_drop_privileges(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
 	parse_config(0);
 	log_welcome("para_server", conf.loglevel_arg);
 	shm_init(); /* init mmd struct */
 	server_uptime(UPTIME_SET); /* reset server uptime */
+	init_user_list(user_list_file);
 	/* become daemon */
 	if (conf.daemon_given)
 		daemon_init();
@@ -368,10 +369,6 @@ static unsigned do_inits(int argc, char **argv)
 	/* init network socket */
 	PARA_NOTICE_LOG("%s", "initializing tcp command socket\n");
 	sockfd = init_network();
-	if (conf.autoplay_given) {
-		mmd->afs_status_flags |= AFS_PLAYING;
-		mmd->new_afs_status_flags |= AFS_PLAYING;
-	}
 	PARA_NOTICE_LOG("%s", "init complete\n");
 	return sockfd;
 }
@@ -404,6 +401,7 @@ static void handle_sighup(void)
 	parse_config(1); /* reopens log */
 	mmd->selector_change = mmd->selector_num; /* do not change selector.. */
 	change_selector(); /* .. just reload */
+	init_user_list(user_list_file); /* reload user list */
 }
 
 static void status_refresh(void)
@@ -445,14 +443,12 @@ int main(int argc, char *argv[])
 	valid_fd_012();
 	sockfd = do_inits(argc, argv);
 repeat:
-	/* check socket and signal pipe in any case */
 	FD_ZERO(&rfds);
 	FD_ZERO(&wfds);
-	FD_SET(sockfd, &rfds);
-	max_fileno = sockfd;
-	FD_SET(signal_pipe, &rfds);
-	max_fileno = MAX(max_fileno, signal_pipe);
-
+	max_fileno = -1;
+	/* check socket and signal pipe in any case */
+	para_fd_set(sockfd, &rfds, &max_fileno);
+	para_fd_set(signal_pipe, &rfds, &max_fileno);
 	timeout = afs_preselect();
 	status_refresh();
 	for (i = 0; senders[i].name; i++) {
@@ -460,14 +456,11 @@ repeat:
 			continue;
 		if (!senders[i].pre_select)
 			continue;
-		senders[i].pre_select(mmd->audio_format >= 0?
-			&afl[mmd->audio_format] : NULL,
-			&max_fileno,
-			&rfds, &wfds);
+		senders[i].pre_select( &max_fileno, &rfds, &wfds);
 	}
 	if (selectors[mmd->selector_num].pre_select) {
 		ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
-		max_fileno = MAX(max_fileno, ret);
+		max_fileno = PARA_MAX(max_fileno, ret);
 	}
 	mmd_unlock();
 	ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
@@ -483,14 +476,10 @@ repeat:
 			continue;
 		if (!senders[i].post_select)
 			continue;
-		senders[i].post_select(mmd->audio_format >= 0?
-			&afl[mmd->audio_format] : NULL,
-			&rfds, &wfds);
-	}
-	if (!ret) {
-		afs_send_chunk();
-		status_refresh();
+		senders[i].post_select(&rfds, &wfds);
 	}
+	afs_send_chunk();
+	status_refresh();
 	if (FD_ISSET(signal_pipe, &rfds)) {
 		int sig;
 		sig = para_next_signal();