X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=7e52fa5e12a2d929a1ef8e390ff31e5dcb7e6b64;hp=43f2010b21e193655765afd0799f4813f4e8fd69;hb=21a0bd773519c5bd39a5293f2e66ea59add8d0a9;hpb=68fd19196e90eee5a8db43d2854c4a3d5f69206b

diff --git a/server.c b/server.c
index 43f2010b..7e52fa5e 100644
--- a/server.c
+++ b/server.c
@@ -30,7 +30,7 @@
 
 
 #include "server.cmdline.h"
-#include "db.h"
+#include "afs.h"
 #include "server.h"
 #include "vss.h"
 #include "config.h"
@@ -51,15 +51,23 @@ INIT_SERVER_ERRLISTS;
 /** shut down non-authorized connections after that many seconds */
 #define ALARM_TIMEOUT 10
 
-/* these are exported to vss.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 *);
@@ -349,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);
@@ -360,6 +369,7 @@ static unsigned do_inits(int argc, char **argv)
 	if (conf.daemon_given)
 		daemon_init();
 	init_selector();
+//	PARA_ERROR_LOG("num: %d\n", mmd->selector_num);
 	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
 	vss_init();
 	mmd->server_pid = getpid();
@@ -426,8 +436,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[])
 {