X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=80cc8f46e36a6e70be2ed13da7bfcce6f5d5a27d;hp=479b6b2de25dd114b8f26adef8db3bbb9c0e317a;hb=d2e164526bed7f523043b7e4ec5bd282d5bc6f19;hpb=51cab2aba416fc1d57336f4e72da6b76ec60174c

diff --git a/server.c b/server.c
index 479b6b2d..80cc8f46 100644
--- a/server.c
+++ b/server.c
@@ -303,12 +303,12 @@ static void setup_signal_handling(void)
 
 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 */
@@ -363,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);
@@ -457,7 +457,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 +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();
@@ -566,7 +566,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);
 }