X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=9688c6ccf2cb4ac29723b0a8dd6f40627c16d934;hp=1805c92b62de84d7131bf71c905dc3d8d23a0d93;hb=f6df536a50641a06bea0437147abd8b9ef919d85;hpb=f3ebfd3dcb117f1c4a91c2c9f08d8ed710ee3907

diff --git a/server.c b/server.c
index 1805c92b..9688c6cc 100644
--- a/server.c
+++ b/server.c
@@ -33,7 +33,6 @@
 #include "db.h"
 #include "server.h"
 #include "afs.h"
-#include "afh.h" /* FIXME */
 #include "config.h"
 #include "close_on_fork.h"
 #include "send.h"
@@ -57,7 +56,7 @@ 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 *);
@@ -235,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 */
@@ -303,11 +302,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)
@@ -340,7 +346,7 @@ static unsigned do_inits(int argc, char **argv)
 
 	init_random_seed();
 	/* parse command line options */
-	cmdline_parser(argc, argv, &conf);
+	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);
@@ -360,10 +366,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;
 }