X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=1022035ff0b7237cfa9508f20a16468a95666726;hp=7fccea77482640f45dcef3a8c7809e54924554ca;hb=73aebb78da7297053f41dba5b3f0cefb33ad248e;hpb=49c5a95ab4ca28d13c6faff59110447aeb0099a5

diff --git a/server.c b/server.c
index 7fccea77..1022035f 100644
--- a/server.c
+++ b/server.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -166,7 +166,7 @@ void para_log(int ll, const char* fmt,...)
 		fprintf(outfd, "%i: ", ll);
 	mypid = getpid();
 	if (conf.loglevel_arg <= INFO)
-		fprintf(outfd, "(%d) ", mypid);
+		fprintf(outfd, "(%d) ", (int)mypid);
 	va_start(argp, fmt);
 	vfprintf(outfd, fmt, argp);
 	va_end(argp);
@@ -204,7 +204,7 @@ static void shm_init(void)
 	mmd->sender_cmd_data.cmd_num = -1;
 	return;
 err_out:
-	PARA_EMERG_LOG("%s", PARA_STRERROR(-ret));
+	PARA_EMERG_LOG("%s", para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }
 
@@ -283,27 +283,31 @@ out:
 
 static void setup_signal_handling(void)
 {
-	int ret = 0;
-
-	signal_pipe = para_signal_init();
+	signal_pipe = para_signal_init(); /* always successful */
 
 	PARA_NOTICE_LOG("setting up signal handlers\n");
-	ret += para_install_sighandler(SIGINT);
-	ret += para_install_sighandler(SIGTERM);
-	ret += para_install_sighandler(SIGHUP);
-	ret += para_install_sighandler(SIGCHLD);
-	ret += para_install_sighandler(SIGUSR1);
-	signal(SIGPIPE, SIG_IGN);
-	if (ret != 5) {
-		PARA_EMERG_LOG("%s", "could not install signal handlers\n");
-		exit(EXIT_FAILURE);
-	}
+	if (para_install_sighandler(SIGINT) < 0)
+		goto err;
+	if (para_install_sighandler(SIGTERM) < 0)
+		goto err;
+	if (para_install_sighandler(SIGHUP) < 0)
+		goto err;
+	if (para_install_sighandler(SIGCHLD) < 0)
+		goto err;
+	if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+		goto err;
+	if (signal(SIGUSR1, SIG_IGN) == SIG_ERR)
+		goto err;
 	add_close_on_fork_list(signal_pipe);
+	return;
+err:
+	PARA_EMERG_LOG("could not install signal handlers\n");
+	exit(EXIT_FAILURE);
 }
 
 static unsigned init_network(void)
 {
-	int fd, ret = tcp_listen(conf.port_arg);
+	int fd, ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg);
 
 	if (ret < 0)
 		goto err;
@@ -314,7 +318,7 @@ static unsigned init_network(void)
 	add_close_on_fork_list(fd); /* child doesn't need the listener */
 	return fd;
 err:
-	PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+	PARA_EMERG_LOG("%s\n", para_strerror(-ret));
 	exit(EXIT_FAILURE);
 }
 
@@ -457,7 +461,7 @@ 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;
@@ -539,11 +543,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();
@@ -566,7 +570,6 @@ genocide:
 	 */
 	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);
 }