Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: 1354303076-13606-1-git-send-email-arne@rfc2549.org
URL: http://article.gmane.org/gmane.network.openvpn.devel/7160
Signed-off-by: David Sommerseth <davids@redhat.com>
... | ... |
@@ -158,7 +158,7 @@ openvpn_getaddrinfo (unsigned int flags, |
158 | 158 |
CLEAR(hints); |
159 | 159 |
hints.ai_family = ai_family; |
160 | 160 |
hints.ai_flags = AI_NUMERICHOST; |
161 |
- hints.ai_socktype = dnsflags_to_socktype(flags); |
|
161 |
+ hints.ai_socktype = SOCK_STREAM; |
|
162 | 162 |
|
163 | 163 |
status = getaddrinfo(hostname, NULL, &hints, res); |
164 | 164 |
|
... | ... |
@@ -478,11 +478,6 @@ bool unix_socket_get_peer_uid_gid (const socket_descriptor_t sd, int *uid, int * |
478 | 478 |
#define GETADDR_UPDATE_MANAGEMENT_STATE (1<<8) |
479 | 479 |
#define GETADDR_RANDOMIZE (1<<9) |
480 | 480 |
|
481 |
-/* [ab]use flags bits to get socktype info downstream */ |
|
482 |
-/* TODO(jjo): resolve tradeoff between hackiness|args-overhead */ |
|
483 |
-#define GETADDR_DGRAM (1<<10) |
|
484 |
-#define dnsflags_to_socktype(flags) ((flags & GETADDR_DGRAM) ? SOCK_DGRAM : SOCK_STREAM) |
|
485 |
- |
|
486 | 481 |
in_addr_t getaddr (unsigned int flags, |
487 | 482 |
const char *hostname, |
488 | 483 |
int resolve_retry_seconds, |