aboutsummaryrefslogtreecommitdiff
path: root/src/openvpn/socket.h
diff options
context:
space:
mode:
authorArne Schwabe2014-03-21 14:18:43 +0100
committerGert Doering2014-03-26 14:18:02 +0100
commit7dbe04de74ea01bd77461ec82253dd769381c711 (patch)
tree3161c577d11fef64a88f3a7ffb101a4a26eaee4c /src/openvpn/socket.h
parente9b088b20847905ed2c2b85a12be58f457c10d06 (diff)
downloadopenvpn-7dbe04de74ea01bd77461ec82253dd769381c711.zip
openvpn-7dbe04de74ea01bd77461ec82253dd769381c711.tar.gz
Clean up of socket code.
Let socket_create take struct addrinfo as argument and use the entries of addrinfo to create the socket. Acked-by: Gert Doering <gert@greenie.muc.de> Message-Id: <1395407925-25518-11-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/8370 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/socket.h')
-rw-r--r--src/openvpn/socket.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h
index 40f524b..f27e9a9 100644
--- a/src/openvpn/socket.h
+++ b/src/openvpn/socket.h
@@ -91,10 +91,6 @@ struct cached_dns_entry {
struct link_socket_actual
{
/*int dummy;*/ /* add offset to force a bug if dest not explicitly dereferenced */
- int ai_family; /* PF_xxx */
- int ai_socktype; /* SOCK_xxx */
- int ai_protocol; /* 0 or IPPROTO_xxx for IPv4 and IPv6 */
-
struct openvpn_sockaddr dest;
#if ENABLE_IP_PKTINFO
@@ -473,7 +469,7 @@ bool ip_or_dns_addr_safe (const char *addr, const bool allow_fqdn);
bool mac_addr_safe (const char *mac_addr);
bool ipv6_addr_safe (const char *ipv6_text_addr);
-socket_descriptor_t create_socket_tcp (int af);
+socket_descriptor_t create_socket_tcp (struct addrinfo*);
socket_descriptor_t socket_do_accept (socket_descriptor_t sd,
struct link_socket_actual *act,