r3278: - rewrote the client side rpc connection code to use lib/socket/

  rather than doing everything itself. This greatly simplifies the
  code, although I really don't like the socket_recv() interface (it
  always allocates memory for you, which means an extra memcpy in this
  code)

- fixed several bugs in the socket_ipv4.c code, in particular client
  side code used a non-blocking connect but didn't handle EINPROGRESS,
  so it had no chance of working. Also fixed the error codes, using
  map_nt_error_from_unix()

- cleaned up and expanded map_nt_error_from_unix()

- changed interpret_addr2() to not take a mem_ctx. It makes absolutely
  no sense to allocate a fixed size 4 byte structure like this. Dozens
  of places in the code were also using interpret_addr2() incorrectly
  (precisely because the allocation made no sense)
(This used to be commit 7f2c771b0e0e98c5c9e5cf662592d64d34ff1205)

1 files changed, 30 insertions, 75 deletions

diff --git a/source4/lib/socket/socket_ipv4.c b/source4/lib/socket/socket_ipv4.c
index 23e34dd39b..20dfd3c92f 100644
--- a/source4/lib/socket/socket_ipv4.c
+++ b/source4/lib/socket/socket_ipv4.c
@@ -24,8 +24,7 @@ static NTSTATUS ipv4_tcp_init(struct socket_context *sock)
 {
 	sock->fd = socket(PF_INET, SOCK_STREAM, 0);
 	if (sock->fd == -1) {
-		/* TODO: we need to map from errno to NTSTATUS here! */ 
-		return NT_STATUS_FOOBAR;
+		return map_nt_error_from_unix(errno);
 	}
 
 	return NT_STATUS_OK;
@@ -37,41 +36,34 @@ static void ipv4_tcp_close(struct socket_context *sock)
 }
 
 static NTSTATUS ipv4_tcp_connect(struct socket_context *sock,
-					const char *my_address, int my_port,
-					const char *srv_address, int srv_port,
-					uint32_t flags)
+				 const char *my_address, int my_port,
+				 const char *srv_address, int srv_port,
+				 uint32_t flags)
 {
-	struct sockaddr_in my_addr;
 	struct sockaddr_in srv_addr;
 	struct in_addr my_ip;
 	struct in_addr srv_ip;
 	int ret;
 
-	ret = inet_aton(my_address, &my_ip);
-	if (ret == 0) {
-		/* not a valid ipv4 address */
-		return NT_STATUS_FOOBAR;
-	}
+	my_ip = interpret_addr2(my_address);
 
-	ZERO_STRUCT(my_addr);
+	if (my_ip.s_addr != 0 || my_port != 0) {
+		struct sockaddr_in my_addr;
+		ZERO_STRUCT(my_addr);
 #ifdef HAVE_SOCK_SIN_LEN
-	my_addr.sin_len		= sizeof(my_addr);
+		my_addr.sin_len		= sizeof(my_addr);
 #endif
-	my_addr.sin_addr	= my_ip;
-	my_addr.sin_port	= htons(my_port);
-	my_addr.sin_family	= PF_INET;
-
-	ret = inet_aton(srv_address, &srv_ip);
-	if (ret == 0) {
-		/* not a valid ipv4 address */
-		return NT_STATUS_FOOBAR;
+		my_addr.sin_addr	= my_ip;
+		my_addr.sin_port	= htons(my_port);
+		my_addr.sin_family	= PF_INET;
+		
+		ret = bind(sock->fd, (struct sockaddr *)&my_addr, sizeof(my_addr));
+		if (ret == -1) {
+			return map_nt_error_from_unix(errno);
+		}
 	}
 
-	ret = bind(sock->fd, (struct sockaddr *)&my_addr, sizeof(my_addr));
-	if (ret == -1) {
-		/* TODO: we need to map from errno to NTSTATUS here! */
-		return NT_STATUS_FOOBAR;
-	}
+	srv_ip = interpret_addr2(srv_address);
 
 	ZERO_STRUCT(srv_addr);
 #ifdef HAVE_SOCK_SIN_LEN
@@ -81,20 +73,18 @@ static NTSTATUS ipv4_tcp_connect(struct socket_context *sock,
 	srv_addr.sin_port	= htons(srv_port);
 	srv_addr.sin_family	= PF_INET;
 
+	ret = connect(sock->fd, (const struct sockaddr *)&srv_addr, sizeof(srv_addr));
+	if (ret == -1) {
+		return map_nt_error_from_unix(errno);
+	}
+
 	if (!(flags & SOCKET_FLAG_BLOCK)) {
 		ret = set_blocking(sock->fd, False);
 		if (ret == -1) {
-			/* TODO: we need to map from errno to NTSTATUS here! */
-			return NT_STATUS_FOOBAR;
+			return map_nt_error_from_unix(errno);
 		}
 	}
 
-	ret = connect(sock->fd, (const struct sockaddr *)&srv_addr, sizeof(srv_addr));
-	if (ret == -1) {
-		/* TODO: we need to map from errno to NTSTATUS here! */
-		return NT_STATUS_FOOBAR;
-	}
-
 	sock->state = SOCKET_STATE_CLIENT_CONNECTED;
 
 	return NT_STATUS_OK;
@@ -108,11 +98,7 @@ static NTSTATUS ipv4_tcp_listen(struct socket_context *sock,
 	struct in_addr ip_addr;
 	int ret;
 
-	ret = inet_aton(my_address, &ip_addr);
-	if (ret == 0) {
-		/* not a valid ipv4 address */
-		return NT_STATUS_FOOBAR;
-	}
+	ip_addr = interpret_addr2(my_address);
 
 	ZERO_STRUCT(my_addr);
 #ifdef HAVE_SOCK_SIN_LEN
@@ -124,21 +110,18 @@ static NTSTATUS ipv4_tcp_listen(struct socket_context *sock,
 
 	ret = bind(sock->fd, (struct sockaddr *)&my_addr, sizeof(my_addr));
 	if (ret == -1) {
-		/* TODO: we need to map from errno to NTSTATUS here! */
-		return NT_STATUS_FOOBAR;
+		return map_nt_error_from_unix(errno);
 	}
 
 	ret = listen(sock->fd, queue_size);
 	if (ret == -1) {
-		/* TODO: we need to map from errno to NTSTATUS here! */
-		return NT_STATUS_FOOBAR;
+		return map_nt_error_from_unix(errno);
 	}
 
 	if (!(flags & SOCKET_FLAG_BLOCK)) {
 		ret = set_blocking(sock->fd, False);
 		if (ret == -1) {
-			/* TODO: we need to map from errno to NTSTATUS here! */
-			return NT_STATUS_FOOBAR;
+			return map_nt_error_from_unix(errno);
 		}
 	}
 
@@ -155,8 +138,7 @@ static NTSTATUS ipv4_tcp_accept(struct socket_context *sock, struct socket_conte
 
 	new_fd = accept(sock->fd, (struct sockaddr *)&cli_addr, &cli_addr_len);
 	if (new_fd == -1) {
-		/* TODO: we need to map from errno to NTSTATUS here! */
-		return NT_STATUS_FOOBAR;
+		return map_nt_error_from_unix(errno);
 	}
 
 	/* TODO: we could add a 'accept_check' hook here
@@ -257,34 +239,7 @@ static NTSTATUS ipv4_tcp_send(struct socket_context *sock, TALLOC_CTX *mem_ctx,
 
 	len = send(sock->fd, blob->data, blob->length, flgs);
 	if (len == -1) {
-		NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
-		switch (errno) {
-			case EBADF:
-			case ENOTSOCK:
-			case EFAULT:
-			case EINVAL:
-				status = NT_STATUS_INVALID_PARAMETER;
-				break;
-			case EMSGSIZE:
-				status = NT_STATUS_INVALID_BUFFER_SIZE;
-				break;
-			case EAGAIN:
-			/*case EWOULDBLOCK: this is an alis of EAGAIN --metze */
-			case EINTR:
-				*sendlen = 0;
-				status = STATUS_MORE_ENTRIES;
-				break;
-			case ENOBUFS:
-				status = NT_STATUS_FOOBAR;
-				break;
-			case ENOMEM:
-				status = NT_STATUS_NO_MEMORY;
-				break;
-			case EPIPE:
-				status = NT_STATUS_CONNECTION_DISCONNECTED;
-				break;
-		}
-		return status;
+		return map_nt_error_from_unix(errno);
 	}	
 
 	*sendlen = len;