X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=41d9a2accd71076daddfe2c101634cc0945b4dfb;hp=7a96eeff76c039ba2a01e84ffc9c232fd057d27d;hb=c85690666e2ed2327e751b819970658d58479bfb;hpb=c2708c767b300a33c8636681ed4550d4f3be0ce0

diff --git a/server.c b/server.c
index 7a96eeff..41d9a2ac 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
  *
  *     This program is free software; you can redistribute it and/or modify
  *     it under the terms of the GNU General Public License as published by
@@ -30,9 +30,9 @@
 
 
 #include "server.cmdline.h"
-#include "db.h"
-#include "server.h"
 #include "afs.h"
+#include "server.h"
+#include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
 #include "send.h"
@@ -42,6 +42,7 @@
 #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 */
@@ -50,15 +51,23 @@ INIT_SERVER_ERRLISTS;
 /** shut down non-authorized connections after that many seconds */
 #define ALARM_TIMEOUT 10
 
-/* these are exported to afs.c. command.c and to all selectors */
+/**
+ * pointer to shared memory area for communication between para_server
+ * and its children. exported to vss.c. command.c and to all selectors.
+ */
 struct misc_meta_data *mmd;
-/** the configuration of para_server
+
+/**
+ * the configuration of para_server
  *
- * It also contains the options for all audio file selectors and all supported
- * senders.
-*/
+ * It also contains the options for all audio file selectors, audio format handler
+ * and all supported senders.
+ */
 struct server_args_info conf;
+
+/** the file containing user information (public key, permissions) */
 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 *);
@@ -181,8 +190,8 @@ static void shm_init(void)
 	mmd->active_connections = 0;
 	strcpy(mmd->filename, "(none)");
 	mmd->audio_format = -1;
-	mmd->afs_status_flags = AFS_NEXT;
-	mmd->new_afs_status_flags = AFS_NEXT;
+	mmd->vss_status_flags = VSS_NEXT;
+	mmd->new_vss_status_flags = VSS_NEXT;
 	mmd->sender_cmd_data.cmd_num = -1;
 	return;
 err_out:
@@ -348,6 +357,7 @@ static unsigned do_inits(int argc, char **argv)
 	init_random_seed();
 	/* parse command line options */
 	server_cmdline_parser(argc, argv, &conf);
+	HANDLE_VERSION_FLAG("server", conf);
 	para_drop_privileges(conf.user_arg, conf.group_arg);
 	/* parse config file, open log and set defaults */
 	parse_config(0);
@@ -359,9 +369,8 @@ static unsigned do_inits(int argc, char **argv)
 	if (conf.daemon_given)
 		daemon_init();
 	init_selector();
-	PARA_NOTICE_LOG("%s", "initializing audio file sender\n");
-	/* audio file sender */
-	afs_init();
+	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
 	mmd_lock();
@@ -400,6 +409,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)
@@ -409,7 +419,7 @@ static void status_refresh(void)
 
 	if (prev_events != mmd->events)
 		goto out;
-	if (mmd->new_afs_status_flags != mmd->afs_status_flags)
+	if (mmd->new_vss_status_flags != mmd->vss_status_flags)
 		goto out;
 	if (uptime / 60 != prev_uptime / 60)
 		goto out;
@@ -417,7 +427,7 @@ static void status_refresh(void)
 out:
 	prev_uptime = uptime;
 	prev_events = mmd->events;
-	mmd->afs_status_flags = mmd->new_afs_status_flags;
+	mmd->vss_status_flags = mmd->new_vss_status_flags;
 	if (ret) {
 		PARA_DEBUG_LOG("%d events, forcing status update, af = %d\n",
 			mmd->events, mmd->audio_format);
@@ -425,8 +435,14 @@ out:
 	}
 }
 
-/*
- * MAIN
+/**
+ * the main function of para_server
+ *
+ * \param argc usual argument count
+ * \param argv usual argument vector
+ *
+ * \return EXIT_SUCCESS or EXIT_FAILURE
+ *
  */
 int main(int argc, char *argv[])
 {
@@ -447,7 +463,7 @@ repeat:
 	/* 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();
+	timeout = vss_preselect();
 	status_refresh();
 	for (i = 0; senders[i].name; i++) {
 		if (senders[i].status != SENDER_ON)
@@ -476,7 +492,7 @@ repeat:
 			continue;
 		senders[i].post_select(&rfds, &wfds);
 	}
-	afs_send_chunk();
+	vss_send_chunk();
 	status_refresh();
 	if (FD_ISSET(signal_pipe, &rfds)) {
 		int sig;