X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=9688c6ccf2cb4ac29723b0a8dd6f40627c16d934;hp=ce56494f4fce68d0ce3f1499b8e00ee609d9b05e;hb=c4012aab461993e6c8a9930d27d924a8462a9775;hpb=786010c598f79d20280e6ea9ea458cad4a7e9af7

diff --git a/server.c b/server.c
index ce56494f..9688c6cc 100644
--- a/server.c
+++ b/server.c
@@ -302,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)
@@ -359,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;
 }