From 15f47aaf533bec4d7d82d75d27c233b3b0b261cd Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 3 Sep 2007 22:39:16 +0000 Subject: [PATCH] r24939: Integrate IPv4 and IPv6 modules (a lot of code can be shared). --- source/lib/socket/config.mk | 19 +- source/lib/socket/{socket_ipv4.c => socket_ip.c} | 453 ++++++++++++++++++- source/lib/socket/socket_ipv6.c | 527 ----------------------- 3 files changed, 443 insertions(+), 556 deletions(-) rename source/lib/socket/{socket_ipv4.c => socket_ip.c} (53%) delete mode 100644 source/lib/socket/socket_ipv6.c diff --git a/source/lib/socket/config.mk b/source/lib/socket/config.mk index 22037cd1367..d1e0bcfef54 100644 --- a/source/lib/socket/config.mk +++ b/source/lib/socket/config.mk @@ -10,25 +10,14 @@ PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL EXT_SOCKET EXT_NSL ############################## ################################################ -# Start MODULE socket_ipv4 -[MODULE::socket_ipv4] +# Start MODULE socket_ip +[MODULE::socket_ip] SUBSYSTEM = samba-socket OUTPUT_TYPE = INTEGRATED OBJ_FILES = \ - socket_ipv4.o + socket_ip.o PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL LIBSAMBA-ERRORS -# End MODULE socket_ipv4 -################################################ - -################################################ -# Start MODULE socket_ipv6 -[MODULE::socket_ipv6] -SUBSYSTEM = samba-socket -OUTPUT_TYPE = INTEGRATED -OBJ_FILES = \ - socket_ipv6.o -PRIVATE_DEPENDENCIES = EXT_SOCKET EXT_NSL -# End MODULE socket_ipv6 +# End MODULE socket_ip ################################################ ################################################ diff --git a/source/lib/socket/socket_ipv4.c b/source/lib/socket/socket_ip.c similarity index 53% rename from source/lib/socket/socket_ipv4.c rename to source/lib/socket/socket_ip.c index d9a4ff0bd14..2cbc211ffe3 100644 --- a/source/lib/socket/socket_ipv4.c +++ b/source/lib/socket/socket_ip.c @@ -1,10 +1,11 @@ /* Unix SMB/CIFS implementation. - Socket IPv4 functions + Socket IPv4/IPv6 functions Copyright (C) Stefan Metzmacher 2004 Copyright (C) Andrew Tridgell 2004-2005 + 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 @@ -50,12 +51,12 @@ static NTSTATUS ipv4_init(struct socket_context *sock) return NT_STATUS_OK; } -static void ipv4_close(struct socket_context *sock) +static void ip_close(struct socket_context *sock) { close(sock->fd); } -static NTSTATUS ipv4_connect_complete(struct socket_context *sock, uint32_t flags) +static NTSTATUS ip_connect_complete(struct socket_context *sock, uint32_t flags) { int error=0, ret; socklen_t len = sizeof(error); @@ -143,7 +144,7 @@ static NTSTATUS ipv4_connect(struct socket_context *sock, } } - return ipv4_connect_complete(sock, flags); + return ip_connect_complete(sock, flags); } @@ -249,7 +250,7 @@ static NTSTATUS ipv4_accept(struct socket_context *sock, struct socket_context * return NT_STATUS_OK; } -static NTSTATUS ipv4_recv(struct socket_context *sock, void *buf, +static NTSTATUS ip_recv(struct socket_context *sock, void *buf, size_t wantlen, size_t *nread) { ssize_t gotlen; @@ -325,7 +326,7 @@ static NTSTATUS ipv4_recvfrom(struct socket_context *sock, void *buf, return NT_STATUS_OK; } -static NTSTATUS ipv4_send(struct socket_context *sock, +static NTSTATUS ip_send(struct socket_context *sock, const DATA_BLOB *blob, size_t *sendlen) { ssize_t len; @@ -496,12 +497,12 @@ static struct socket_address *ipv4_get_my_addr(struct socket_context *sock, TALL return local; } -static int ipv4_get_fd(struct socket_context *sock) +static int ip_get_fd(struct socket_context *sock) { return sock->fd; } -static NTSTATUS ipv4_pending(struct socket_context *sock, size_t *npending) +static NTSTATUS ip_pending(struct socket_context *sock, size_t *npending) { int value = 0; if (ioctl(sock->fd, FIONREAD, &value) == 0) { @@ -515,25 +516,449 @@ static const struct socket_ops ipv4_ops = { .name = "ipv4", .fn_init = ipv4_init, .fn_connect = ipv4_connect, - .fn_connect_complete = ipv4_connect_complete, + .fn_connect_complete = ip_connect_complete, .fn_listen = ipv4_listen, .fn_accept = ipv4_accept, - .fn_recv = ipv4_recv, + .fn_recv = ip_recv, .fn_recvfrom = ipv4_recvfrom, - .fn_send = ipv4_send, + .fn_send = ip_send, .fn_sendto = ipv4_sendto, - .fn_pending = ipv4_pending, - .fn_close = ipv4_close, + .fn_pending = ip_pending, + .fn_close = ip_close, .fn_set_option = ipv4_set_option, .fn_get_peer_name = ipv4_get_peer_name, .fn_get_peer_addr = ipv4_get_peer_addr, .fn_get_my_addr = ipv4_get_my_addr, - .fn_get_fd = ipv4_get_fd + .fn_get_fd = ip_get_fd }; const struct socket_ops *socket_ipv4_ops(enum socket_type type) { return &ipv4_ops; } + +#if HAVE_IPV6 + +static struct in6_addr interpret_addr6(const char *name) +{ + struct hostent *he; + + if (name == NULL) return in6addr_any; + + if (strcasecmp(name, "localhost") == 0) { + name = "::1"; + } + + 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); + } + + sock->backend_name = "ipv6"; + + return NT_STATUS_OK; +} + +static NTSTATUS ipv6_tcp_connect(struct socket_context *sock, + const struct socket_address *my_address, + const struct socket_address *srv_address, + uint32_t flags) +{ + int ret; + + if (my_address && my_address->sockaddr) { + ret = bind(sock->fd, my_address->sockaddr, my_address->sockaddrlen); + if (ret == -1) { + return map_nt_error_from_unix(errno); + } + } else if (my_address) { + struct in6_addr my_ip; + my_ip = interpret_addr6(my_address->addr); + + if (memcmp(&my_ip, &in6addr_any, sizeof(my_ip)) || my_address->port != 0) { + struct sockaddr_in6 my_addr; + ZERO_STRUCT(my_addr); + my_addr.sin6_addr = my_ip; + my_addr.sin6_port = htons(my_address->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); + } + } + } + + if (srv_address->sockaddr) { + ret = connect(sock->fd, srv_address->sockaddr, srv_address->sockaddrlen); + } else { + struct in6_addr srv_ip; + struct sockaddr_in6 srv_addr; + srv_ip = interpret_addr6(srv_address->addr); + if (memcmp(&srv_ip, &in6addr_any, sizeof(srv_ip)) == 0) { + return NT_STATUS_BAD_NETWORK_NAME; + } + + ZERO_STRUCT(srv_addr); + srv_addr.sin6_addr = srv_ip; + srv_addr.sin6_port = htons(srv_address->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); + } + + return ip_connect_complete(sock, flags); +} + +static NTSTATUS ipv6_tcp_listen(struct socket_context *sock, + const struct socket_address *my_address, + int queue_size, uint32_t flags) +{ + struct sockaddr_in6 my_addr; + struct in6_addr ip_addr; + int ret; + + socket_set_option(sock, "SO_REUSEADDR=1", NULL); + + if (my_address->sockaddr) { + ret = bind(sock->fd, my_address->sockaddr, my_address->sockaddrlen); + } else { + ip_addr = interpret_addr6(my_address->addr); + + ZERO_STRUCT(my_addr); + my_addr.sin6_addr = ip_addr; + my_addr.sin6_port = htons(my_address->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); + } + + if (sock->type == SOCKET_TYPE_STREAM) { + 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; + + if (sock->type != SOCKET_TYPE_STREAM) { + return NT_STATUS_INVALID_PARAMETER; + } + + + 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(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; + (*new_sock)->backend_name = sock->backend_name; + + return NT_STATUS_OK; +} + +static NTSTATUS ipv6_recvfrom(struct socket_context *sock, void *buf, + size_t wantlen, size_t *nread, + TALLOC_CTX *addr_ctx, struct socket_address **_src) +{ + ssize_t gotlen; + struct sockaddr_in6 *from_addr; + socklen_t from_len = sizeof(*from_addr); + struct socket_address *src; + struct hostent *he; + + src = talloc(addr_ctx, struct socket_address); + if (!src) { + return NT_STATUS_NO_MEMORY; + } + + src->family = sock->backend_name; + + from_addr = talloc(src, struct sockaddr_in6); + if (!from_addr) { + talloc_free(src); + return NT_STATUS_NO_MEMORY; + } + + src->sockaddr = (struct sockaddr *)from_addr; + + *nread = 0; + + gotlen = recvfrom(sock->fd, buf, wantlen, 0, + src->sockaddr, &from_len); + if (gotlen == 0) { + talloc_free(src); + return NT_STATUS_END_OF_FILE; + } else if (gotlen == -1) { + talloc_free(src); + return map_nt_error_from_unix(errno); + } + + src->sockaddrlen = from_len; + + he = gethostbyaddr((void *)&from_addr->sin6_addr, sizeof(from_addr->sin6_addr), AF_INET6); + if (he == NULL) { + talloc_free(src); + return NT_STATUS_INTERNAL_ERROR; + } + src->addr = talloc_strdup(src, he->h_name); + if (src->addr == NULL) { + talloc_free(src); + return NT_STATUS_NO_MEMORY; + } + src->port = ntohs(from_addr->sin6_port); + + *nread = gotlen; + *_src = src; + return NT_STATUS_OK; +} + +static NTSTATUS ipv6_sendto(struct socket_context *sock, + const DATA_BLOB *blob, size_t *sendlen, + const struct socket_address *dest_addr) +{ + ssize_t len; + + if (dest_addr->sockaddr) { + len = sendto(sock->fd, blob->data, blob->length, 0, + dest_addr->sockaddr, dest_addr->sockaddrlen); + } else { + struct sockaddr_in6 srv_addr; + struct in6_addr addr; + + ZERO_STRUCT(srv_addr); + addr = interpret_addr6(dest_addr->addr); + if (addr.s6_addr == 0) { + return NT_STATUS_HOST_UNREACHABLE; + } + srv_addr.sin6_addr = addr; + srv_addr.sin6_port = htons(dest_addr->port); + srv_addr.sin6_family = PF_INET6; + + *sendlen = 0; + + len = sendto(sock->fd, blob->data, blob->length, 0, + (struct sockaddr *)&srv_addr, sizeof(srv_addr)); + } + 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 struct socket_address *ipv6_tcp_get_peer_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx) +{ + struct sockaddr_in6 *peer_addr; + socklen_t len = sizeof(*peer_addr); + struct socket_address *peer; + int ret; + char addr[128]; + const char *addr_ret; + + peer = talloc(mem_ctx, struct socket_address); + if (!peer) { + return NULL; + } + + peer->family = sock->backend_name; + peer_addr = talloc(peer, struct sockaddr_in6); + if (!peer_addr) { + talloc_free(peer); + return NULL; + } + + peer->sockaddr = (struct sockaddr *)peer_addr; + + ret = getpeername(sock->fd, peer->sockaddr, &len); + if (ret == -1) { + talloc_free(peer); + return NULL; + } + + peer->sockaddrlen = len; + + addr_ret = inet_ntop(AF_INET6, &peer_addr->sin6_addr, addr, sizeof(addr)); + if (addr_ret == NULL) { + talloc_free(peer); + return NULL; + } + + peer->addr = talloc_strdup(peer, addr_ret); + if (peer->addr == NULL) { + talloc_free(peer); + return NULL; + } + + peer->port = ntohs(peer_addr->sin6_port); + + return peer; +} + +static struct socket_address *ipv6_tcp_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx) +{ + struct sockaddr_in6 *local_addr; + socklen_t len = sizeof(*local_addr); + struct socket_address *local; + int ret; + struct hostent *he; + + local = talloc(mem_ctx, struct socket_address); + if (!local) { + return NULL; + } + + local->family = sock->backend_name; + local_addr = talloc(local, struct sockaddr_in6); + if (!local_addr) { + talloc_free(local); + return NULL; + } + + local->sockaddr = (struct sockaddr *)local_addr; + + ret = getsockname(sock->fd, local->sockaddr, &len); + if (ret == -1) { + talloc_free(local); + return NULL; + } + + local->sockaddrlen = len; + + he = gethostbyaddr((char *)&local_addr->sin6_addr, len, AF_INET6); + + if (!he || !he->h_name) { + talloc_free(local); + return NULL; + } + + local->addr = talloc_strdup(mem_ctx, he->h_name); + if (!local->addr) { + talloc_free(local); + return NULL; + } + local->port = ntohs(local_addr->sin6_port); + + return local; +} + +static const struct socket_ops ipv6_tcp_ops = { + .name = "ipv6", + .fn_init = ipv6_tcp_init, + .fn_connect = ipv6_tcp_connect, + .fn_connect_complete = ip_connect_complete, + .fn_listen = ipv6_tcp_listen, + .fn_accept = ipv6_tcp_accept, + .fn_recv = ip_recv, + .fn_recvfrom = ipv6_recvfrom, + .fn_sendto = ipv6_sendto, + .fn_send = ip_send, + .fn_close = ip_close, + .fn_pending = ip_pending, + + .fn_set_option = ipv6_tcp_set_option, + + .fn_get_peer_name = ipv6_tcp_get_peer_name, + .fn_get_peer_addr = ipv6_tcp_get_peer_addr, + .fn_get_my_addr = ipv6_tcp_get_my_addr, + + .fn_get_fd = ip_get_fd +}; + +const struct socket_ops *socket_ipv6_ops(enum socket_type type) +{ + return &ipv6_tcp_ops; +} + +#endif diff --git a/source/lib/socket/socket_ipv6.c b/source/lib/socket/socket_ipv6.c deleted file mode 100644 index 8b86958417f..00000000000 --- a/source/lib/socket/socket_ipv6.c +++ /dev/null @@ -1,527 +0,0 @@ -/* - 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 3 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, see . -*/ - -#include "includes.h" -#include "lib/socket/socket.h" -#include "system/filesys.h" /* needed for close() */ -#include "system/network.h" - -static struct in6_addr interpret_addr6(const char *name) -{ - struct hostent *he; - - if (name == NULL) return in6addr_any; - - if (strcasecmp(name, "localhost") == 0) { - name = "::1"; - } - - 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); - } - - sock->backend_name = "ipv6"; - - return NT_STATUS_OK; -} - -static void ipv6_tcp_close(struct socket_context *sock) -{ - close(sock->fd); -} - -static NTSTATUS ipv6_tcp_connect_complete(struct socket_context *sock, uint32_t flags) -{ - int error=0, ret; - socklen_t len = sizeof(error); - - /* check for any errors that may have occurred - this is needed - for non-blocking connect */ - ret = getsockopt(sock->fd, SOL_SOCKET, SO_ERROR, &error, &len); - if (ret == -1) { - return map_nt_error_from_unix(errno); - } - if (error != 0) { - return map_nt_error_from_unix(error); - } - - 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_connect(struct socket_context *sock, - const struct socket_address *my_address, - const struct socket_address *srv_address, - uint32_t flags) -{ - int ret; - - if (my_address && my_address->sockaddr) { - ret = bind(sock->fd, my_address->sockaddr, my_address->sockaddrlen); - if (ret == -1) { - return map_nt_error_from_unix(errno); - } - } else if (my_address) { - struct in6_addr my_ip; - my_ip = interpret_addr6(my_address->addr); - - if (memcmp(&my_ip, &in6addr_any, sizeof(my_ip)) || my_address->port != 0) { - struct sockaddr_in6 my_addr; - ZERO_STRUCT(my_addr); - my_addr.sin6_addr = my_ip; - my_addr.sin6_port = htons(my_address->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); - } - } - } - - if (srv_address->sockaddr) { - ret = connect(sock->fd, srv_address->sockaddr, srv_address->sockaddrlen); - } else { - struct in6_addr srv_ip; - struct sockaddr_in6 srv_addr; - srv_ip = interpret_addr6(srv_address->addr); - if (memcmp(&srv_ip, &in6addr_any, sizeof(srv_ip)) == 0) { - return NT_STATUS_BAD_NETWORK_NAME; - } - - ZERO_STRUCT(srv_addr); - srv_addr.sin6_addr = srv_ip; - srv_addr.sin6_port = htons(srv_address->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); - } - - return ipv6_tcp_connect_complete(sock, flags); -} - -static NTSTATUS ipv6_tcp_listen(struct socket_context *sock, - const struct socket_address *my_address, - int queue_size, uint32_t flags) -{ - struct sockaddr_in6 my_addr; - struct in6_addr ip_addr; - int ret; - - socket_set_option(sock, "SO_REUSEADDR=1", NULL); - - if (my_address->sockaddr) { - ret = bind(sock->fd, my_address->sockaddr, my_address->sockaddrlen); - } else { - ip_addr = interpret_addr6(my_address->addr); - - ZERO_STRUCT(my_addr); - my_addr.sin6_addr = ip_addr; - my_addr.sin6_port = htons(my_address->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); - } - - if (sock->type == SOCKET_TYPE_STREAM) { - 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; - - if (sock->type != SOCKET_TYPE_STREAM) { - return NT_STATUS_INVALID_PARAMETER; - } - - - 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(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; - (*new_sock)->backend_name = sock->backend_name; - - return NT_STATUS_OK; -} - -static NTSTATUS ipv6_tcp_recv(struct socket_context *sock, void *buf, - size_t wantlen, size_t *nread) -{ - ssize_t gotlen; - - *nread = 0; - - gotlen = recv(sock->fd, buf, wantlen, 0); - 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_recvfrom(struct socket_context *sock, void *buf, - size_t wantlen, size_t *nread, - TALLOC_CTX *addr_ctx, struct socket_address **_src) -{ - ssize_t gotlen; - struct sockaddr_in6 *from_addr; - socklen_t from_len = sizeof(*from_addr); - struct socket_address *src; - struct hostent *he; - - src = talloc(addr_ctx, struct socket_address); - if (!src) { - return NT_STATUS_NO_MEMORY; - } - - src->family = sock->backend_name; - - from_addr = talloc(src, struct sockaddr_in6); - if (!from_addr) { - talloc_free(src); - return NT_STATUS_NO_MEMORY; - } - - src->sockaddr = (struct sockaddr *)from_addr; - - *nread = 0; - - gotlen = recvfrom(sock->fd, buf, wantlen, 0, - src->sockaddr, &from_len); - if (gotlen == 0) { - talloc_free(src); - return NT_STATUS_END_OF_FILE; - } else if (gotlen == -1) { - talloc_free(src); - return map_nt_error_from_unix(errno); - } - - src->sockaddrlen = from_len; - - he = gethostbyaddr((void *)&from_addr->sin6_addr, sizeof(from_addr->sin6_addr), AF_INET6); - if (he == NULL) { - talloc_free(src); - return NT_STATUS_INTERNAL_ERROR; - } - src->addr = talloc_strdup(src, he->h_name); - if (src->addr == NULL) { - talloc_free(src); - return NT_STATUS_NO_MEMORY; - } - src->port = ntohs(from_addr->sin6_port); - - *nread = gotlen; - *_src = src; - return NT_STATUS_OK; -} - -static NTSTATUS ipv6_tcp_send(struct socket_context *sock, - const DATA_BLOB *blob, size_t *sendlen) -{ - ssize_t len; - - *sendlen = 0; - - len = send(sock->fd, blob->data, blob->length, 0); - if (len == -1) { - return map_nt_error_from_unix(errno); - } - - *sendlen = len; - - return NT_STATUS_OK; -} - -static NTSTATUS ipv6_sendto(struct socket_context *sock, - const DATA_BLOB *blob, size_t *sendlen, - const struct socket_address *dest_addr) -{ - ssize_t len; - - if (dest_addr->sockaddr) { - len = sendto(sock->fd, blob->data, blob->length, 0, - dest_addr->sockaddr, dest_addr->sockaddrlen); - } else { - struct sockaddr_in6 srv_addr; - struct in6_addr addr; - - ZERO_STRUCT(srv_addr); - addr = interpret_addr6(dest_addr->addr); - if (addr.s6_addr == 0) { - return NT_STATUS_HOST_UNREACHABLE; - } - srv_addr.sin6_addr = addr; - srv_addr.sin6_port = htons(dest_addr->port); - srv_addr.sin6_family = PF_INET6; - - *sendlen = 0; - - len = sendto(sock->fd, blob->data, blob->length, 0, - (struct sockaddr *)&srv_addr, sizeof(srv_addr)); - } - 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 struct socket_address *ipv6_tcp_get_peer_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx) -{ - struct sockaddr_in6 *peer_addr; - socklen_t len = sizeof(*peer_addr); - struct socket_address *peer; - int ret; - char addr[128]; - const char *addr_ret; - - peer = talloc(mem_ctx, struct socket_address); - if (!peer) { - return NULL; - } - - peer->family = sock->backend_name; - peer_addr = talloc(peer, struct sockaddr_in6); - if (!peer_addr) { - talloc_free(peer); - return NULL; - } - - peer->sockaddr = (struct sockaddr *)peer_addr; - - ret = getpeername(sock->fd, peer->sockaddr, &len); - if (ret == -1) { - talloc_free(peer); - return NULL; - } - - peer->sockaddrlen = len; - - addr_ret = inet_ntop(AF_INET6, &peer_addr->sin6_addr, addr, sizeof(addr)); - if (addr_ret == NULL) { - talloc_free(peer); - return NULL; - } - - peer->addr = talloc_strdup(peer, addr_ret); - if (peer->addr == NULL) { - talloc_free(peer); - return NULL; - } - - peer->port = ntohs(peer_addr->sin6_port); - - return peer; -} - -static struct socket_address *ipv6_tcp_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx) -{ - struct sockaddr_in6 *local_addr; - socklen_t len = sizeof(*local_addr); - struct socket_address *local; - int ret; - struct hostent *he; - - local = talloc(mem_ctx, struct socket_address); - if (!local) { - return NULL; - } - - local->family = sock->backend_name; - local_addr = talloc(local, struct sockaddr_in6); - if (!local_addr) { - talloc_free(local); - return NULL; - } - - local->sockaddr = (struct sockaddr *)local_addr; - - ret = getsockname(sock->fd, local->sockaddr, &len); - if (ret == -1) { - talloc_free(local); - return NULL; - } - - local->sockaddrlen = len; - - he = gethostbyaddr((char *)&local_addr->sin6_addr, len, AF_INET6); - - if (!he || !he->h_name) { - talloc_free(local); - return NULL; - } - - local->addr = talloc_strdup(mem_ctx, he->h_name); - if (!local->addr) { - talloc_free(local); - return NULL; - } - local->port = ntohs(local_addr->sin6_port); - - return local; -} - -static int ipv6_tcp_get_fd(struct socket_context *sock) -{ - return sock->fd; -} - -static NTSTATUS ipv6_pending(struct socket_context *sock, size_t *npending) -{ - int value = 0; - if (ioctl(sock->fd, FIONREAD, &value) == 0) { - *npending = value; - return NT_STATUS_OK; - } - return map_nt_error_from_unix(errno); -} - -static const struct socket_ops ipv6_tcp_ops = { - .name = "ipv6", - .fn_init = ipv6_tcp_init, - .fn_connect = ipv6_tcp_connect, - .fn_connect_complete = ipv6_tcp_connect_complete, - .fn_listen = ipv6_tcp_listen, - .fn_accept = ipv6_tcp_accept, - .fn_recv = ipv6_tcp_recv, - .fn_recvfrom = ipv6_recvfrom, - .fn_sendto = ipv6_sendto, - .fn_send = ipv6_tcp_send, - .fn_close = ipv6_tcp_close, - .fn_pending = ipv6_pending, - - .fn_set_option = ipv6_tcp_set_option, - - .fn_get_peer_name = ipv6_tcp_get_peer_name, - .fn_get_peer_addr = ipv6_tcp_get_peer_addr, - .fn_get_my_addr = ipv6_tcp_get_my_addr, - - .fn_get_fd = ipv6_tcp_get_fd -}; - -const struct socket_ops *socket_ipv6_ops(enum socket_type type) -{ - return &ipv6_tcp_ops; -} -- 2.11.4.GIT