X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=net.c;h=cffd250e182d36e94a1ffe06db9f96abcabe3100;hb=b635d7d83e5475ae471536ce9275be14e18fd539;hp=56edb8e7a473479ae40eebebf51b608f2f749d68;hpb=02649835488d8ca1b3fd5d682ffcff8649da09c9;p=paraslash.git

diff --git a/net.c b/net.c
index 56edb8e7..cffd250e 100644
--- a/net.c
+++ b/net.c
@@ -6,6 +6,8 @@
 
 /** \file net.c Networking-related helper functions. */
 
+#include <netdb.h> /* hostent */
+
 #include "para.h"
 #include "error.h"
 #include "net.h"
@@ -80,7 +82,7 @@ void disable_crypt(int fd)
  * If \a he is null (server mode), \a addr->sin_addr is initialized with \p
  * INADDR_ANY.  Otherwise, the address given by \a he is copied to addr.
  */
-void init_sockaddr(struct sockaddr_in *addr, int port, const struct hostent *he)
+static void init_sockaddr(struct sockaddr_in *addr, int port, const struct hostent *he)
 {
 	/* host byte order */
 	addr->sin_family = AF_INET;
@@ -254,22 +256,34 @@ int recv_buffer(int fd, char *buf, size_t size)
 }
 
 /**
- * wrapper around gethostbyname
- *
- * \param host hostname or IPv4 address
- * \param ret the hostent structure is returned here
+ * Establish a tcp connection.
  *
- * \return positive on success, negative on errors. On success, \a ret
- * contains the return value of the underlying gethostbyname() call.
+ * \param host Hostname or IPv4 address.
+ * \param port The tcp port.
  *
- * \sa gethostbyname(2)
+ * \return Negative on errors, a valid file descriptor on success.
  */
-int get_host_info(char *host, struct hostent **ret)
+int tcp_connect(char *host, int port)
 {
+	struct sockaddr_in addr;
+	struct hostent *he;
+	int ret, fd;
+
 	PARA_INFO_LOG("getting host info of %s\n", host);
 	/* FIXME: gethostbyname() is obsolete */
-	*ret = gethostbyname(host);
-	return *ret? 1 : -E_HOST_INFO;
+	he = gethostbyname(host);
+	if (!he)
+		return -ERRNO_TO_PARA_ERROR(h_errno);
+	init_sockaddr(&addr, port, he);
+	ret = get_stream_socket(AF_INET);
+	if (ret < 0)
+		return ret;
+	fd = ret;
+	ret = PARA_CONNECT(fd, &addr);
+	if (ret >= 0)
+		return fd;
+	close(fd);
+	return ret;
 }
 
 /**
@@ -277,20 +291,20 @@ int get_host_info(char *host, struct hostent **ret)
  *
  * \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;
 }
 
 /**
@@ -316,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
  *
@@ -371,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;
@@ -507,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);
@@ -527,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: