X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=send_common.c;h=5a9ddf641796931e70accd1fa1ae3a74bfbff57d;hb=d4603bf234d23adb56b208efb90ce66772c4ef5b;hp=b03be8775d9f4e12841cb8353639dd9f70725a1f;hpb=b59e841036a107b52a0221e48d7e05f86da92979;p=paraslash.git

diff --git a/send_common.c b/send_common.c
index b03be877..5a9ddf64 100644
--- a/send_common.c
+++ b/send_common.c
@@ -1,8 +1,4 @@
-/*
- * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
- *
- * Licensed under the GPL v2. For licencing details see COPYING.
- */
+/* Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>, see file COPYING. */
 
 /** \file send_common.c Functions used by more than one paraslash sender. */
 
@@ -34,34 +30,6 @@
 /** Clients will be kicked if there are more than that many bytes pending. */
 #define MAX_CQ_BYTES 40000
 
-/**
- * Open a passive socket of given layer4 type.
- *
- * Set the resulting file descriptor to nonblocking mode and add it to the list
- * of fds that are being closed in the child process when the server calls
- * fork().
- *
- * \param l4type The transport-layer protocol.
- * \param port The port number.
- *
- * \return The listening fd on success, negative on errors.
- */
-static int open_sender(unsigned l4type, int port)
-{
-	int fd, ret = para_listen_simple(l4type, port);
-
-	if (ret < 0)
-		return ret;
-	fd = ret;
-	ret = mark_fd_nonblocking(fd);
-	if (ret < 0) {
-		close(fd);
-		return ret;
-	}
-	add_close_on_fork_list(fd);
-	return fd;
-}
-
 /**
  * Shut down a client connected to a paraslash sender.
  *
@@ -238,21 +206,38 @@ void generic_com_deny(struct sender_command_data *scd,
  * Activate a paraslash sender.
  *
  * \param ss The sender to activate.
- * \param protocol The symbolic name of the transport-layer protocol.
+ * \param protocol layer4 type (IPPROTO_TCP or IPPROTO_DCCP).
  *
- * \return Standard.
+ * This opens a passive socket of given layer4 type, sets the resulting file
+ * descriptor to nonblocking mode and adds it to the close on fork list.
+ *
+ * Errors are logged but otherwise ignored.
  */
-int generic_com_on(struct sender_status *ss, unsigned protocol)
+void generic_com_on(struct sender_status *ss, unsigned protocol)
 {
-	int ret;
+	int fd, ret;
 
 	if (ss->listen_fd >= 0)
-		return 1;
-	ret = open_sender(protocol, ss->port);
-	if (ret < 0)
-		return ret;
+		return;
+	ret = para_listen_simple(protocol, ss->port);
+	if (ret < 0) {
+		PARA_ERROR_LOG("could not listen on port %d: %s\n", ss->port,
+			para_strerror(-ret));
+		return;
+	}
+	fd = ret;
+	ret = mark_fd_nonblocking(fd);
+	if (ret < 0) {
+		PARA_ERROR_LOG("could not set %s socket fd for port %d to "
+			"nonblocking mode: %s\n",
+			protocol == IPPROTO_TCP? "TCP" : "DCCP", ss->port,
+			para_strerror(-ret));
+		close(fd);
+		return;
+	}
+	add_close_on_fork_list(fd);
 	ss->listen_fd = ret;
-	return 1;
+	return;
 }
 
 /**
@@ -281,9 +266,8 @@ void generic_com_off(struct sender_status *ss)
  * \param ss The sender whose listening fd is ready for reading.
  * \param rfds Passed to para_accept(),
  *
- * This must be called only if the socket fd of \a ss is ready for reading.  It
- * calls para_accept() to accept the connection and performs the following
- * actions on the resulting file descriptor \a fd:
+ * This calls para_accept() and performs the following actions on the resulting
+ * file descriptor fd:
  *
  *	- Checks whether the maximal number of connections are exceeded.
  *	- Sets \a fd to nonblocking mode.