X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fconnection.c;h=184ee5a4231a302ee520dfecb05b845cdde0e4bb;hb=7eba49d24d56288d83746f3f0ce383d7c0c36552;hp=0d287491e861b9ad87f2d3844d592fc066768324;hpb=c3bbe13023ec0021a18f99d6e9b643d84a3505cb;p=tlsproxy%2Ftlsproxy.git diff --git a/src/connection.c b/src/connection.c index 0d28749..184ee5a 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,7 @@ /* * Handle connections. * - * Copyright (C) 2011-2013 Simon Ruderich + * Copyright (C) 2011-2014 Simon Ruderich * * 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 @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -206,7 +207,7 @@ void handle_connection(int client_socket) { LOG(DEBUG1, "connection to server established"); /* If the -u option is used and we don't know this hostname's server - * certificate then just pass through the connection and let the client + * certificate, then just pass through the connection and let the client * verify the server certificate. */ if (global_passthrough_unknown) { char path[TLSPROXY_MAX_PATH_LENGTH]; @@ -843,8 +844,10 @@ static int connect_to_host(const char *hostname, const char *port) { gai_hints.ai_socktype = SOCK_STREAM; gai_hints.ai_protocol = 0; gai_hints.ai_flags = AI_NUMERICSERV /* given port is numeric */ +#ifdef AI_ADDRCONFIG | AI_ADDRCONFIG /* supported by this computer */ - | AI_V4MAPPED; /* support IPv4 through IPv6 */ +#endif + ; gai_return = getaddrinfo(hostname, port, &gai_hints, &gai_result); if (gai_return != 0) { if (gai_return == EAI_SYSTEM) {