diff options
| author | Bernhard Schmidt <berni@debian.org> | 2019-03-07 21:38:56 +0100 |
|---|---|---|
| committer | Bernhard Schmidt <berni@debian.org> | 2019-03-07 21:38:56 +0100 |
| commit | cfcec33bd88faeb354a33bd5f8052486ac848f9a (patch) | |
| tree | 8e1ace9a34f5ee12b34416b02d514da67d54c907 /src/openvpn/socket.h | |
| parent | 7486cf05cdeb6996fdf249e5a2f15d93a47dbac1 (diff) | |
| parent | a351f71e82badcc71a2ce881bbb97eccfcebc06b (diff) | |
Merge tag 'debian/2.4.7-1' into stretch-backports
openvpn Debian release 2.4.7-1
Diffstat (limited to 'src/openvpn/socket.h')
| -rw-r--r-- | src/openvpn/socket.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/openvpn/socket.h b/src/openvpn/socket.h index 2d7f218..80e8128 100644 --- a/src/openvpn/socket.h +++ b/src/openvpn/socket.h @@ -5,7 +5,7 @@ * packet encryption, packet authentication, and * packet compression. * - * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net> + * Copyright (C) 2002-2018 OpenVPN Inc <sales@openvpn.net> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 @@ -532,12 +532,24 @@ bool unix_socket_get_peer_uid_gid(const socket_descriptor_t sd, int *uid, int *g #define GETADDR_CACHE_MASK (GETADDR_DATAGRAM|GETADDR_PASSIVE) +/** + * Translate an IPv4 addr or hostname from string form to in_addr_t + * + * In case of resolve error, it will try again for + * resolve_retry_seconds seconds. + */ in_addr_t getaddr(unsigned int flags, const char *hostname, int resolve_retry_seconds, bool *succeeded, volatile int *signal_received); +/** + * Translate an IPv6 addr or hostname from string form to in6_addr + */ +bool get_ipv6_addr(const char *hostname, struct in6_addr *network, + unsigned int *netbits, int msglevel); + int openvpn_getaddrinfo(unsigned int flags, const char *hostname, const char *servname, |