r3329: Add support for IPv6

(This used to be commit d8298901243ca4ce2ec420fa523c8e1407e72513)

4 files changed, 373 insertions, 0 deletions

diff --git a/source4/lib/socket/config.m4 b/source4/lib/socket/config.m4
index c91f21368f..588bf9064e 100644
--- a/source4/lib/socket/config.m4
+++ b/source4/lib/socket/config.m4
@@ -1,5 +1,6 @@
 
 SMB_MODULE_MK(socket_ipv4,SOCKET,STATIC,lib/socket/config.mk)
+SMB_MODULE_MK(socket_ipv6,SOCKET,STATIC,lib/socket/config.mk)
 SMB_MODULE_MK(socket_unix,SOCKET,STATIC,lib/socket/config.mk)
 
 SMB_SUBSYSTEM_MK(SOCKET,lib/socket/config.mk)
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index 6072f743ce..76e5895933 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -8,6 +8,14 @@ INIT_OBJ_FILES = \
 ################################################
 
 ################################################
+# Start MODULE socket_ipv6
+[MODULE::socket_ipv6]
+INIT_OBJ_FILES = \
+		lib/socket/socket_ipv6.o
+# End MODULE socket_ipv6
+################################################
+
+################################################
 # Start MODULE socket_unix
 [MODULE::socket_unix]
 INIT_OBJ_FILES = \
diff --git a/source4/lib/socket/socket.c b/source4/lib/socket/socket.c
index 9bdd57d200..c3cacbebd8 100644
--- a/source4/lib/socket/socket.c
+++ b/source4/lib/socket/socket.c
@@ -267,6 +267,10 @@ const struct socket_ops *socket_getops_byname(const char *name, enum socket_type
 		return socket_ipv4_ops();
 	}
 
+	if (strcmp("ipv6", name) == 0) {
+		return socket_ipv6_ops();
+	}
+
 	if (strcmp("unix", name) == 0) {
 		return socket_unixdom_ops();
 	}
diff --git a/source4/lib/socket/socket_ipv6.c b/source4/lib/socket/socket_ipv6.c
new file mode 100644
index 0000000000..268212dcca
--- /dev/null
+++ b/source4/lib/socket/socket_ipv6.c
@@ -0,0 +1,360 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Socket IPv6 functions
+   Copyright (C) Stefan Metzmacher 2004
+   Copyright (C) Jelmer Vernooij 2004
+   
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+
+static struct in6_addr interpret_addr6(const char *name)
+{
+	struct hostent *he;
+	
+	if (name == NULL) return in6addr_any;
+	
+	he = gethostbyname2(name, PF_INET6);
+
+	if (he == NULL) return in6addr_any;
+
+	return *((struct in6_addr *)he->h_addr);
+}
+
+static NTSTATUS ipv6_tcp_init(struct socket_context *sock)
+{
+	sock->fd = socket(PF_INET6, SOCK_STREAM, 0);
+	if (sock->fd == -1) {
+		return map_nt_error_from_unix(errno);
+	}
+
+	return NT_STATUS_OK;
+}
+
+static void ipv6_tcp_close(struct socket_context *sock)
+{
+	close(sock->fd);
+}
+
+static NTSTATUS ipv6_tcp_connect(struct socket_context *sock,
+				 const char *my_address, int my_port,
+				 const char *srv_address, int srv_port,
+				 uint32_t flags)
+{
+	struct sockaddr_in6 srv_addr;
+	struct in6_addr my_ip;
+	struct in6_addr srv_ip;
+	int ret;
+
+	my_ip = interpret_addr6(my_address);
+
+	if (memcmp(&my_ip, &in6addr_any, sizeof(my_ip)) || my_port != 0) {
+		struct sockaddr_in6 my_addr;
+		ZERO_STRUCT(my_addr);
+		my_addr.sin6_addr	= my_ip;
+		my_addr.sin6_port	= htons(my_port);
+		my_addr.sin6_family	= PF_INET6;
+		
+		ret = bind(sock->fd, (struct sockaddr *)&my_addr, sizeof(my_addr));
+		if (ret == -1) {
+			return map_nt_error_from_unix(errno);
+		}
+	}
+
+	srv_ip = interpret_addr6(srv_address);
+
+	ZERO_STRUCT(srv_addr);
+	srv_addr.sin6_addr	= srv_ip;
+	srv_addr.sin6_port	= htons(srv_port);
+	srv_addr.sin6_family	= PF_INET6;
+
+	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) {
+			return map_nt_error_from_unix(errno);
+		}
+	}
+
+	sock->state = SOCKET_STATE_CLIENT_CONNECTED;
+
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ipv6_tcp_listen(struct socket_context *sock,
+					const char *my_address, int port,
+					int queue_size, uint32_t flags)
+{
+	struct sockaddr_in6 my_addr;
+	struct in6_addr ip_addr;
+	int ret;
+
+	ip_addr = interpret_addr6(my_address);
+
+	ZERO_STRUCT(my_addr);
+	my_addr.sin6_addr	= ip_addr;
+	my_addr.sin6_port	= htons(port);
+	my_addr.sin6_family	= PF_INET6;
+
+	ret = bind(sock->fd, (struct sockaddr *)&my_addr, sizeof(my_addr));
+	if (ret == -1) {
+		return map_nt_error_from_unix(errno);
+	}
+
+	ret = listen(sock->fd, queue_size);
+	if (ret == -1) {
+		return map_nt_error_from_unix(errno);
+	}
+
+	if (!(flags & SOCKET_FLAG_BLOCK)) {
+		ret = set_blocking(sock->fd, False);
+		if (ret == -1) {
+			return map_nt_error_from_unix(errno);
+		}
+	}
+
+	sock->state= SOCKET_STATE_SERVER_LISTEN;
+
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ipv6_tcp_accept(struct socket_context *sock, struct socket_context **new_sock)
+{
+	struct sockaddr_in cli_addr;
+	socklen_t cli_addr_len = sizeof(cli_addr);
+	int new_fd;
+
+	new_fd = accept(sock->fd, (struct sockaddr *)&cli_addr, &cli_addr_len);
+	if (new_fd == -1) {
+		return map_nt_error_from_unix(errno);
+	}
+
+	if (!(sock->flags & SOCKET_FLAG_BLOCK)) {
+		int ret = set_blocking(new_fd, False);
+		if (ret == -1) {
+			close(new_fd);
+			return map_nt_error_from_unix(errno);
+		}
+	}
+
+	/* TODO: we could add a 'accept_check' hook here
+	 *	 which get the black/white lists via socket_set_accept_filter()
+	 *	 or something like that
+	 *	 --metze
+	 */
+
+	(*new_sock) = talloc_p(NULL, struct socket_context);
+	if (!(*new_sock)) {
+		close(new_fd);
+		return NT_STATUS_NO_MEMORY;
+	}
+
+	/* copy the socket_context */
+	(*new_sock)->type		= sock->type;
+	(*new_sock)->state		= SOCKET_STATE_SERVER_CONNECTED;
+	(*new_sock)->flags		= sock->flags;
+
+	(*new_sock)->fd			= new_fd;
+
+	(*new_sock)->private_data	= NULL;
+	(*new_sock)->ops		= sock->ops;
+
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ipv6_tcp_recv(struct socket_context *sock, void *buf, 
+			      size_t wantlen, size_t *nread, uint32_t flags)
+{
+	ssize_t gotlen;
+	int flgs = 0;
+
+	/* TODO: we need to map all flags here */
+	if (flags & SOCKET_FLAG_PEEK) {
+		flgs |= MSG_PEEK;
+	}
+
+	if (flags & SOCKET_FLAG_BLOCK) {
+		flgs |= MSG_WAITALL;
+	}
+
+	*nread = 0;
+
+	gotlen = recv(sock->fd, buf, wantlen, flgs);
+	if (gotlen == 0) {
+		return NT_STATUS_END_OF_FILE;
+	} else if (gotlen == -1) {
+		return map_nt_error_from_unix(errno);
+	}
+
+	*nread = gotlen;
+
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ipv6_tcp_send(struct socket_context *sock, 
+			      const DATA_BLOB *blob, size_t *sendlen, uint32_t flags)
+{
+	ssize_t len;
+	int flgs = 0;
+
+	*sendlen = 0;
+
+	len = send(sock->fd, blob->data, blob->length, flgs);
+	if (len == -1) {
+		return map_nt_error_from_unix(errno);
+	}	
+
+	*sendlen = len;
+
+	return NT_STATUS_OK;
+}
+
+static NTSTATUS ipv6_tcp_set_option(struct socket_context *sock, const char *option, const char *val)
+{
+	set_socket_options(sock->fd, option);
+	return NT_STATUS_OK;
+}
+
+static char *ipv6_tcp_get_peer_name(struct socket_context *sock, TALLOC_CTX *mem_ctx)
+{
+	struct sockaddr_in6 peer_addr;
+	socklen_t len = sizeof(peer_addr);
+	struct hostent *he;
+	int ret;
+
+	ret = getpeername(sock->fd, (struct sockaddr *)&peer_addr, &len);
+	if (ret == -1) {
+		return NULL;
+	}
+
+	he = gethostbyaddr((char *)&peer_addr.sin6_addr, sizeof(peer_addr.sin6_addr), AF_INET6);
+	if (he == NULL) {
+		return NULL;
+	}
+
+	return talloc_strdup(mem_ctx, he->h_name);
+}
+
+static char *ipv6_tcp_get_peer_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx)
+{
+	struct sockaddr_in6 peer_addr;
+	socklen_t len = sizeof(peer_addr);
+	int ret;
+	struct hostent *he;
+
+	ret = getpeername(sock->fd, (struct sockaddr *)&peer_addr, &len);
+	if (ret == -1) {
+		return NULL;
+	}
+
+	he = gethostbyaddr(&peer_addr.sin6_addr, sizeof(peer_addr.sin6_addr), AF_INET6);
+
+	if (!he || !he->h_name) {
+		return NULL;
+	}
+	
+	return talloc_strdup(mem_ctx, he->h_name);
+}
+
+static int ipv6_tcp_get_peer_port(struct socket_context *sock)
+{
+	struct sockaddr_in6 peer_addr;
+	socklen_t len = sizeof(peer_addr);
+	int ret;
+
+	ret = getpeername(sock->fd, (struct sockaddr *)&peer_addr, &len);
+	if (ret == -1) {
+		return -1;
+	}
+
+	return ntohs(peer_addr.sin6_port);
+}
+
+static char *ipv6_tcp_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx)
+{
+	struct sockaddr_in6 my_addr;
+	socklen_t len = sizeof(my_addr);
+	int ret;
+	struct hostent *he;
+
+	ret = getsockname(sock->fd, (struct sockaddr *)&my_addr, &len);
+	if (ret == -1) {
+		return NULL;
+	}
+
+	he = gethostbyaddr((char *)&my_addr.sin6_addr, sizeof(my_addr.sin6_addr), AF_INET6);
+	if (he == NULL) {
+		return NULL;
+	}
+
+	return talloc_strdup(mem_ctx, he->h_name);
+}
+
+static int ipv6_tcp_get_my_port(struct socket_context *sock)
+{
+	struct sockaddr_in6 my_addr;
+	socklen_t len = sizeof(my_addr);
+	int ret;
+
+	ret = getsockname(sock->fd, (struct sockaddr *)&my_addr, &len);
+	if (ret == -1) {
+		return -1;
+	}
+
+	return ntohs(my_addr.sin6_port);
+}
+
+static int ipv6_tcp_get_fd(struct socket_context *sock)
+{
+	return sock->fd;
+}
+
+static const struct socket_ops ipv6_tcp_ops = {
+	.name		= "ipv6",
+	.type		= SOCKET_TYPE_STREAM,
+
+	.init		= ipv6_tcp_init,
+	.connect	= ipv6_tcp_connect,
+	.listen		= ipv6_tcp_listen,
+	.accept		= ipv6_tcp_accept,
+	.recv		= ipv6_tcp_recv,
+	.send		= ipv6_tcp_send,
+	.close		= ipv6_tcp_close,
+
+	.set_option	= ipv6_tcp_set_option,
+
+	.get_peer_name	= ipv6_tcp_get_peer_name,
+	.get_peer_addr	= ipv6_tcp_get_peer_addr,
+	.get_peer_port	= ipv6_tcp_get_peer_port,
+	.get_my_addr	= ipv6_tcp_get_my_addr,
+	.get_my_port	= ipv6_tcp_get_my_port,
+
+	.get_fd		= ipv6_tcp_get_fd
+};
+
+const struct socket_ops *socket_ipv6_ops(void)
+{
+	return &ipv6_tcp_ops;
+}
+
+NTSTATUS socket_ipv6_init(void)
+{
+	return NT_STATUS_OK;
+}