X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=ce56494f4fce68d0ce3f1499b8e00ee609d9b05e;hp=8f20763fb44ed01327514b92837dceb8b0f66021;hb=b829b61f516298a0de3907cd4c30aef189dd8dd4;hpb=df445c2b07824c950c38d06e74f2b84843bbeb6c

diff --git a/server.c b/server.c
index 8f20763f..ce56494f 100644
--- a/server.c
+++ b/server.c
@@ -41,6 +41,7 @@
 #include "daemon.h"
 #include "string.h"
 #include "ipc.h"
+#include "fd.h"
 
 /** define the array of error lists needed by para_server */
 INIT_SERVER_ERRLISTS;
@@ -55,13 +56,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;
+struct server_args_info conf;
 char *user_list = 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[] = {
 	{
@@ -134,15 +135,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);
@@ -241,7 +234,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 */
@@ -268,7 +261,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);
@@ -347,8 +339,8 @@ 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);
@@ -436,7 +428,7 @@ int main(int argc, char *argv[])
 	/* listen on sock_fd, new connection on new_fd */
 	int sockfd, new_fd;
 	struct sockaddr_in their_addr;
-	int err, i, max_fileno, ret;
+	int i, max_fileno, ret;
 	pid_t chld_pid;
 	fd_set rfds, wfds;
 	struct timeval *timeout;
@@ -444,14 +436,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++) {
@@ -459,44 +449,30 @@ 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();
-//	PARA_DEBUG_LOG("%s: select (max = %i)\n", __func__, max_fileno);
-	ret = select(max_fileno + 1, &rfds, &wfds, NULL, timeout);
-	err = errno;
-	//PARA_DEBUG_LOG("%s: select returned  %i\n", __func__, ret);
+	ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
 	mmd_lock();
 	if (mmd->selector_change >= 0)
 		change_selector();
 	if (selectors[mmd->selector_num].post_select)
 		selectors[mmd->selector_num].post_select(&rfds, &wfds);
-	if (ret < 0 && err == EINTR)
-		goto repeat;
-	if (ret < 0) {
-		PARA_CRIT_LOG("select error (%s)\n", strerror(err));
+	if (ret < 0)
 		goto repeat;
-	}
 	for (i = 0; senders[i].name; i++) {
 		if (senders[i].status != SENDER_ON)
 			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();