Rename init_tcp_socket() to tcp_listen() and further net.c cleanups.

Cleanups consist in the following:

	- get rid of setserversockopts(). It had only one caller
	  within net.c, so incorporate it into tcp_listen().

	- Kill E_BIND, E_LISTEN, E_SETSOCKOPT and E_SOCKET. Return
	  converted errno instead.

diff --git a/error.h b/error.h
index d2d3dff8a82de6d375b194e37824d602b168c670..083582f8093c3793406d0eab4b148b6b49becd1b 100644 (file)
--- a/error.h
+++ b/error.h
@@ -173,16 +173,12 @@ extern const char **para_errlist[];
 
 
 #define NET_ERRORS \
-       PARA_ERROR(SOCKET, "socket error"), \
        PARA_ERROR(CONNECT, "connect error"), \
-       PARA_ERROR(SETSOCKOPT, "failed to set socket options"), \
-       PARA_ERROR(BIND, "bind error"), \
        PARA_ERROR(NAME_TOO_LONG, "name too long for struct sockaddr_un"), \
        PARA_ERROR(CHMOD, "failed to set socket mode"), \
        PARA_ERROR(SENDMSG, "sendmsg() failed"), \
        PARA_ERROR(RECVMSG, "recvmsg() failed"), \
        PARA_ERROR(SCM_CREDENTIALS, "did not receive SCM credentials"), \
-       PARA_ERROR(LISTEN, "listen error"), \
        PARA_ERROR(RECV_PATTERN, "did not receive expected pattern"), \
 
 

diff --git a/http_send.c b/http_send.c
index f3ae608b4b5ac235894faaeca609eed4694ef50c..7be22da07dc9c0cd60c88dcb52c031277e9c33c5 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -334,7 +334,7 @@ static int open_tcp_port(int port)
 {
        int ret;
 
-       server_fd = init_tcp_socket(port);
+       server_fd = tcp_listen(port);
        if (server_fd < 0) {
                http_shutdown_clients();
                self->status = SENDER_OFF;

diff --git a/net.c b/net.c
index a5013b16c08b94510ad6acc8c69888b0444bac3f..58221fa6754a950ba52bbb272df9438b63a0824c 100644 (file)
--- a/net.c
+++ b/net.c
@@ -291,20 +291,20 @@ int tcp_connect(char *host, int port)
  *
  * \param domain The communication domain that selects the protocol family.
  *
- * \return The socket fd on success, -E_SOCKET on errors.
- *
  * Create an IPv4 socket for sequenced, reliable, two-way, connection-based
  * byte streams.
  *
+ * \return The socket fd on success, negative on errors.
+ *
  * \sa socket(2).
  */
 int get_stream_socket(int domain)
 {
-       int socket_fd;
+       int fd = socket(domain, SOCK_STREAM, 0);
 
-       if ((socket_fd = socket(domain, SOCK_STREAM, 0)) == -1)
-               return -E_SOCKET;
-       return socket_fd;
+       if (fd < 0)
+               return -ERRNO_TO_PARA_ERROR(errno);
+       return fd;
 }
 
 /**
@@ -330,16 +330,6 @@ int para_accept(int fd, void *addr, socklen_t size)
        return new_fd < 0? -ERRNO_TO_PARA_ERROR(errno) : new_fd;
 }
 
-static int setserversockopts(int socket_fd)
-{
-       int yes = 1;
-
-       if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, &yes,
-                       sizeof(int)) == -1)
-               return -E_SETSOCKOPT;
-       return 1;
-}
-
 /**
  * prepare a structure for \p AF_UNIX socket addresses
  *
@@ -385,12 +375,15 @@ int create_local_socket(const char *name, struct sockaddr_un *unix_addr,
        ret = init_unix_addr(unix_addr, name);
        if (ret < 0)
                return ret;
-       fd = socket(PF_UNIX, SOCK_STREAM, 0);
-       if (fd < 0)
-               return -E_SOCKET;
-       ret = -E_BIND;
-       if (bind(fd, (struct sockaddr *) unix_addr, UNIX_PATH_MAX) < 0)
+       ret = socket(PF_UNIX, SOCK_STREAM, 0);
+       if (ret < 0)
+               return -ERRNO_TO_PARA_ERROR(errno);
+       fd = ret;
+       ret = bind(fd, (struct sockaddr *) unix_addr, UNIX_PATH_MAX);
+       if (ret < 0) {
+               ret = -ERRNO_TO_PARA_ERROR(errno);
                goto err;
+       }
        ret = -E_CHMOD;
        if (chmod(name, mode) < 0)
                goto err;
@@ -521,19 +514,18 @@ int recv_cred_buffer(int fd, char *buf, size_t size)
 #define BACKLOG 10
 
 /**
- * create a socket, bind it and listen
+ * Create a tcp socket, bind it and listen on the given port.
  *
- * \param port the tcp port to listen on
+ * \param Port the tcp port to listen on.
  *
- * \return The file descriptor of the created socket, negative
- * on errors.
+ * \return The file descriptor of the created socket, negative on errors.
  *
  * \sa get_stream_socket()
  * \sa setsockopt(2)
  * \sa bind(2)
  * \sa listen(2)
  */
-int init_tcp_socket(int port)
+int tcp_listen(int port)
 {
        struct sockaddr_in my_addr;
        int fd, ret = get_stream_socket(AF_INET);
@@ -541,19 +533,23 @@ int init_tcp_socket(int port)
        if (ret < 0)
                return ret;
        fd = ret;
-       ret = setserversockopts(fd);
-       if (ret < 0)
+       ret = 1;
+       ret = setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &ret, sizeof(int));
+       if (ret < 0) {
+               ret = -ERRNO_TO_PARA_ERROR(errno);
                goto err;
+       }
        init_sockaddr(&my_addr, port, NULL);
-       ret = -E_BIND;
-       if (bind(fd, (struct sockaddr *)&my_addr,
-                       sizeof(struct sockaddr)) == -1) {
-               PARA_CRIT_LOG("bind error: %s\n", strerror(errno));
+       ret = bind(fd, (struct sockaddr *)&my_addr, sizeof(struct sockaddr));
+       if (ret < 0) {
+               ret = -ERRNO_TO_PARA_ERROR(errno);
                goto err;
        }
-       ret = -E_LISTEN;
-       if (listen(fd, BACKLOG) == -1)
+       ret = listen(fd, BACKLOG);
+       if (ret < 0) {
+               ret = -ERRNO_TO_PARA_ERROR(errno);
                goto err;
+       }
        PARA_INFO_LOG("listening on port %d, fd %d\n", port, fd);
        return fd;
 err:

diff --git a/net.h b/net.h
index 6613d3f93d606cfe2daa81323298c86cefb670f7..8b5d4a1a8aef2c87fbb0329fedd0b64c7e5528a8 100644 (file)
--- a/net.h
+++ b/net.h
@@ -34,7 +34,7 @@ int init_unix_addr(struct sockaddr_un *, const char *);
 int recv_cred_buffer(int, char *, size_t);
 ssize_t send_cred_buffer(int, char*);
 int recv_pattern(int fd, const char *pattern, size_t bufsize);
-int init_tcp_socket(int port);
+int tcp_listen(int port);
 void enable_crypt(int fd, crypt_function *recv_f, crypt_function *send_f,
        void *private_data);
 void disable_crypt(int fd);

diff --git a/server.c b/server.c
index bb80738634d9fb68027e344521b2c806876a9f75..7fccea77482640f45dcef3a8c7809e54924554ca 100644 (file)
--- a/server.c
+++ b/server.c
@@ -303,7 +303,7 @@ static void setup_signal_handling(void)
 
 static unsigned init_network(void)
 {
-       int fd, ret = init_tcp_socket(conf.port_arg);
+       int fd, ret = tcp_listen(conf.port_arg);
 
        if (ret < 0)
                goto err;