X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=e10c1e0343c77f1462bb7117b38486f39161411f;hp=67d9bce4e5aea8822f5c4462af37fa2fb36c6ec1;hb=850791c25b352396d11a1ca658fb735d057c9e57;hpb=c9f109a9e7f2d6116b7906a852afc339c858c275

diff --git a/server.c b/server.c
index 67d9bce4..e10c1e03 100644
--- a/server.c
+++ b/server.c
@@ -21,8 +21,9 @@
 
 /** \mainpage Paraslash API Reference
  *
- *  Good starting points for reading are probably \ref dbtool, \ref sender,
- *  \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
+ *  Good starting points for reading are probably \ref audio_file_selector,
+ *  \ref sender, \ref receiver, \ref receiver_node, \ref filter, \ref
+ *  filter_node.
  *
  */
 
@@ -40,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;
@@ -47,11 +49,11 @@ INIT_SERVER_ERRLISTS;
 /** shut down non-authorized connections after that many seconds */
 #define ALARM_TIMEOUT 10
 
-/* these are exported to afs/command/dbtool */
+/* these are exported to afs.c. command.c and to all selectors */
 struct misc_meta_data *mmd;
 /** the configuration of para_server
  *
- * It also contains the options for all database tools and all supported
+ * It also contains the options for all audio file selectors and all supported
  * senders.
 */
 struct gengetopt_args_info conf;
@@ -61,16 +63,16 @@ extern void http_send_init(struct sender *);
 extern void ortp_send_init(struct sender *);
 extern struct audio_format afl[];
 
-/** the list of supported database tools */
-struct dbtool dblist[] = {
+/** the list of supported audio file selectors */
+struct audio_file_selector selectors[] = {
 	{
 		.name = "random",
-		.init = random_dbtool_init,
+		.init = random_selector_init,
 		.update_audio_file = NULL,
 	},
 	{
-		.name = "plm",
-		.init = plm_dbtool_init,
+		.name = "playlist",
+		.init = playlist_selector_init,
 		.update_audio_file = NULL,
 		.pre_select = NULL,
 		.post_select = NULL,
@@ -78,7 +80,7 @@ struct dbtool dblist[] = {
 #ifdef HAVE_MYSQL
 	{
 		.name = "mysql",
-		.init = mysql_dbtool_init,
+		.init = mysql_selector_init,
 		.update_audio_file = NULL,
 		.pre_select = NULL,
 		.post_select = NULL,
@@ -122,7 +124,7 @@ static int signal_pipe;
  * \param ll the log level
  * \param fmt the format string describing the log message
  */
-void para_log(int ll, char* fmt,...)
+void para_log(int ll, const char* fmt,...)
 {
 	va_list argp;
 	FILE *outfd;
@@ -133,15 +135,7 @@ void para_log(int ll, 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);
@@ -178,7 +172,7 @@ static void shm_init(void)
 		goto err_out;
 	mmd_mutex = ret;
 
-	mmd->dbt_num = 0;
+	mmd->selector_num = 0;
 	mmd->num_played = 0;
 	mmd->num_commands = 0;
 	mmd->events = 0;
@@ -267,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);
@@ -281,30 +274,30 @@ static void setup_signal_handling(void)
 	}
 }
 
-static void init_dbtool(void)
+static void init_selector(void)
 {
 	int i, ret;
 
-	mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */
-	if (!conf.dbtool_given)
+	mmd->selector_change = -1; /* no change nec., set to new num by com_chs */
+	if (!conf.selector_given)
 		goto random;
-	for (i = 0; dblist[i].name; i++) {
-		if (strcmp(dblist[i].name, conf.dbtool_arg))
+	for (i = 0; selectors[i].name; i++) {
+		if (strcmp(selectors[i].name, conf.selector_arg))
 			continue;
-		PARA_NOTICE_LOG("initializing %s database tool\n",
-			dblist[i].name);
-		ret = dblist[i].init(&dblist[i]);
+		PARA_NOTICE_LOG("initializing %s audio file selector\n",
+			selectors[i].name);
+		ret = selectors[i].init(&selectors[i]);
 		if (ret < 0) {
 			PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
 			break;
 		}
-		mmd->dbt_num = i;
+		mmd->selector_num = i;
 		return;
 	}
-	PARA_WARNING_LOG("%s", "falling back to the random dbtool\n");
+	PARA_WARNING_LOG("%s", "falling back to the random selector\n");
 random:
-	mmd->dbt_num = 0;
-	dblist[0].init(&dblist[0]); /* always successful */
+	mmd->selector_num = 0;
+	selectors[0].init(&selectors[0]); /* always successful */
 }
 
 static unsigned init_network(void)
@@ -347,7 +340,7 @@ 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);
+	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);
@@ -356,7 +349,7 @@ static unsigned do_inits(int argc, char **argv)
 	/* become daemon */
 	if (conf.daemon_given)
 		daemon_init();
-	init_dbtool();
+	init_selector();
 	PARA_NOTICE_LOG("%s", "initializing audio file sender\n");
 	/* audio file sender */
 	afs_init();
@@ -374,21 +367,21 @@ static unsigned do_inits(int argc, char **argv)
 	return sockfd;
 }
 
-static void handle_dbt_change(void)
+static void change_selector(void)
 {
-	int ret, old = mmd->dbt_num, new = mmd->dbt_change;
+	int ret, old = mmd->selector_num, new = mmd->selector_change;
 
-	dblist[old].shutdown();
-	ret = dblist[new].init(&dblist[new]);
-	mmd->dbt_change = -1; /* reset */
+	selectors[old].shutdown();
+	ret = selectors[new].init(&selectors[new]);
+	mmd->selector_change = -1; /* reset */
 	if (ret >= 0) {
-		mmd->dbt_num = new;
+		mmd->selector_num = new;
 		return;
 	}
 	/* init failed */
-	PARA_ERROR_LOG("%s -- switching to the random dbtool\n", PARA_STRERROR(-ret));
-	dblist[0].init(&dblist[0]);
-	mmd->dbt_num = 0;
+	PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
+	selectors[0].init(&selectors[0]);
+	mmd->selector_num = 0;
 }
 
 /*
@@ -400,8 +393,8 @@ static void handle_sighup(void)
 	close_log(logfile); /* gets reopened if necessary by parse_config */
 	logfile = NULL;
 	parse_config(1); /* reopens log */
-	mmd->dbt_change = mmd->dbt_num; /* do not change dbtool */
-	handle_dbt_change(); /* force reloading dbtool */
+	mmd->selector_change = mmd->selector_num; /* do not change selector.. */
+	change_selector(); /* .. just reload */
 }
 
 static void status_refresh(void)
@@ -435,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;
@@ -449,7 +442,7 @@ repeat:
 	FD_SET(sockfd, &rfds);
 	max_fileno = sockfd;
 	FD_SET(signal_pipe, &rfds);
-	max_fileno = MAX(max_fileno, signal_pipe);
+	max_fileno = PARA_MAX(max_fileno, signal_pipe);
 
 	timeout = afs_preselect();
 	status_refresh();
@@ -463,26 +456,19 @@ repeat:
 			&max_fileno,
 			&rfds, &wfds);
 	}
-	if (dblist[mmd->dbt_num].pre_select) {
-		ret = dblist[mmd->dbt_num].pre_select(&rfds, &wfds);
-		max_fileno = MAX(max_fileno, ret);
+	if (selectors[mmd->selector_num].pre_select) {
+		ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
+		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->dbt_change >= 0)
-		handle_dbt_change();
-	if (dblist[mmd->dbt_num].post_select)
-		dblist[mmd->dbt_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 (mmd->selector_change >= 0)
+		change_selector();
+	if (selectors[mmd->selector_num].post_select)
+		selectors[mmd->selector_num].post_select(&rfds, &wfds);
+	if (ret < 0)
 		goto repeat;
-	}
 	for (i = 0; senders[i].name; i++) {
 		if (senders[i].status != SENDER_ON)
 			continue;
@@ -511,7 +497,7 @@ repeat:
 		case SIGTERM:
 			PARA_EMERG_LOG("terminating on signal %d\n", sig);
 			kill(0, SIGTERM);
-			dblist[mmd->dbt_num].shutdown();
+			selectors[mmd->selector_num].shutdown();
 			mutex_destroy(mmd_mutex);
 			shm_detach(mmd);
 			shm_destroy(mmd_shm_id);