X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=80cc8f46e36a6e70be2ed13da7bfcce6f5d5a27d;hp=d16675be7a53373b9f2bb442091d2c5a92c30ab9;hb=8d7f47e8cec74e4d209cfa1f6c4c0cec3b0e5019;hpb=5244fcecf39219c7ccca0b94355de054fbef91d4

diff --git a/server.c b/server.c
index d16675be..80cc8f46 100644
--- a/server.c
+++ b/server.c
@@ -23,8 +23,8 @@
  *
  * The gory details, listed by topic:
  *
- * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c \ref aac_afh.c,
- * 	- Decoders: \ref mp3dec.c, \ref \ref oggdec.c, \ref aacdec.c,
+ * 	- Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ * 	- Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
  *	- Volume normalizer: \ref compress.c,
  *	- Output: \ref alsa_write.c, \ref osx_write.c,
  * 	- http: \ref http_recv.c, \ref http_send.c,
@@ -32,7 +32,7 @@
  *	- dccp: \ref dccp_recv.c, \ref dccp_send.c,
  *	- Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c,
  *	- Afs structures: \ref afs_table, \ref audio_file_data,
- *	  \ref afs_info \ref audio_format_info,
+ *	  \ref afs_info \ref afh_info,
  *	- Afs tables: \ref aft.c, \ref mood.c, \ref playlist.c,
  *	  \ref attribute.c, \ref score.c,
  *	- The virtual streaming system: \ref vss.c, \ref chunk_queue.c.
@@ -199,7 +199,6 @@ static void shm_init(void)
 	mmd->events = 0;
 	mmd->num_connects = 0;
 	mmd->active_connections = 0;
-	strcpy(mmd->afd.path, "(none)");
 	mmd->vss_status_flags = VSS_NEXT;
 	mmd->new_vss_status_flags = VSS_NEXT;
 	mmd->sender_cmd_data.cmd_num = -1;
@@ -287,7 +286,8 @@ static void setup_signal_handling(void)
 	int ret = 0;
 
 	signal_pipe = para_signal_init();
-	PARA_NOTICE_LOG("%s", "setting up signal handlers\n");
+
+	PARA_NOTICE_LOG("setting up signal handlers\n");
 	ret += para_install_sighandler(SIGINT);
 	ret += para_install_sighandler(SIGTERM);
 	ret += para_install_sighandler(SIGHUP);
@@ -298,18 +298,20 @@ static void setup_signal_handling(void)
 		PARA_EMERG_LOG("%s", "could not install signal handlers\n");
 		exit(EXIT_FAILURE);
 	}
+	add_close_on_fork_list(signal_pipe);
 }
 
 static unsigned init_network(void)
 {
-	int fd, ret = init_tcp_socket(conf.port_arg);
+	int fd, ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg);
 
 	if (ret < 0)
 		goto err;
 	fd = ret;
-	ret = mark_fd_nonblock(fd);
+	ret = mark_fd_nonblocking(fd);
 	if (ret < 0)
 		goto err;
+	add_close_on_fork_list(fd); /* child doesn't need the listener */
 	return fd;
 err:
 	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
@@ -361,7 +363,7 @@ static void init_afs(void)
 	}
 	close(afs_server_socket[1]);
 	afs_socket = afs_server_socket[0];
-	ret = mark_fd_nonblock(afs_socket);
+	ret = mark_fd_nonblocking(afs_socket);
 	if (ret < 0)
 		exit(EXIT_FAILURE);
 	add_close_on_fork_list(afs_socket);
@@ -370,7 +372,7 @@ static void init_afs(void)
 }
 
 
-static unsigned do_inits(int argc, char **argv)
+static unsigned server_init(int argc, char **argv)
 {
 	/* connector's address information */
 	int sockfd;
@@ -389,17 +391,19 @@ static unsigned do_inits(int argc, char **argv)
 	/* become daemon */
 	if (conf.daemon_given)
 		daemon_init();
-	PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+	PARA_NOTICE_LOG("initializing audio format handlers\n");
 	afh_init();
+	PARA_NOTICE_LOG("initializing virtual streaming system\n");
 	vss_init();
 	mmd->server_pid = getpid();
 	setup_signal_handling();
+	PARA_NOTICE_LOG("initializing the audio file selector\n");
 	init_afs();
 	mmd_lock();
 	/* init network socket */
-	PARA_NOTICE_LOG("%s", "initializing tcp command socket\n");
+	PARA_NOTICE_LOG("initializing tcp command socket\n");
 	sockfd = init_network();
-	PARA_NOTICE_LOG("%s", "init complete\n");
+	PARA_NOTICE_LOG("server init complete\n");
 	return sockfd;
 }
 
@@ -453,14 +457,14 @@ int main(int argc, char *argv[])
 {
 	/* listen on sock_fd, new connection on new_fd */
 	int sockfd, new_fd;
-	struct sockaddr_in their_addr;
+	char *peer_name;
 	int i, max_fileno, ret;
 	pid_t chld_pid;
 	fd_set rfds, wfds;
 	struct timeval *timeout;
 
 	valid_fd_012();
-	sockfd = do_inits(argc, argv);
+	sockfd = server_init(argc, argv);
 repeat:
 	FD_ZERO(&rfds);
 	FD_ZERO(&wfds);
@@ -535,11 +539,11 @@ genocide:
 	if (!FD_ISSET(sockfd, &rfds))
 		goto repeat;
 
-	new_fd = para_accept(sockfd, &their_addr, sizeof(struct sockaddr_in));
+	new_fd = para_accept(sockfd, NULL, 0);
 	if (new_fd < 0)
 		goto repeat;
-	PARA_INFO_LOG("got connection from %s, forking\n",
-		inet_ntoa(their_addr.sin_addr));
+	peer_name = remote_name(new_fd);
+	PARA_INFO_LOG("got connection from %s, forking\n", peer_name);
 	mmd->num_connects++;
 	mmd->active_connections++;
 	random();
@@ -555,14 +559,13 @@ genocide:
 	}
 	alarm(ALARM_TIMEOUT);
 	close_listed_fds();
-	close(sockfd); /* child doesn't need the listener */
+	para_signal_shutdown();
 	/*
 	 * put info on who we are serving into argv[0] to make
 	 * client ip visible in top/ps
 	 */
 	for (i = argc - 1; i >= 0; i--)
 		memset(argv[i], 0, strlen(argv[i]));
-	sprintf(argv[0], "para_server (serving %s)",
-		inet_ntoa(their_addr.sin_addr));
-	return handle_connect(new_fd, &their_addr);
+	sprintf(argv[0], "para_server (serving %s)", peer_name);
+	return handle_connect(new_fd, peer_name);
 }