From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 17 Mar 2018 00:57:43 +0000 (+0100)
Subject: send_common: Combine generic_com_on() and open_sender().
X-Git-Tag: v0.6.2~18
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=ac9f8fc0b4a20b3ec1d205029ef61321174d15b6;p=paraslash.git

send_common: Combine generic_com_on() and open_sender().

The latter function is only called by the former, and both are short.
---

diff --git a/send_common.c b/send_common.c
index 71c33b04..4bb50ce5 100644
--- a/send_common.c
+++ b/send_common.c
@@ -30,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.
  *
@@ -240,13 +212,20 @@ void generic_com_deny(struct sender_command_data *scd,
  */
 int 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);
+	ret = para_listen_simple(protocol, ss->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);
 	ss->listen_fd = ret;
 	return 1;
 }