X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fconnection.c;h=fb854da4536937ae43f136ff6f418cbbaf776698;hb=HEAD;hp=ad7298a876033dd3b37e7303901506c9f4b9b463;hpb=730ce301477d9d5c9367756bad840eb4504e0257;p=tlsproxy%2Ftlsproxy.git diff --git a/src/connection.c b/src/connection.c index ad7298a..fb854da 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 @@ -102,9 +102,9 @@ void handle_connection(int client_socket) { int version_minor; /* x in HTTP/1.x */ int result; - /* client_x509_cred is used when talking to the client (acting as a TSL + /* client_x509_cred is used when talking to the client (acting as a TLS * server), server_x509_cred is used when talking to the server (acting as - * a TSL client). */ + * a TLS client). */ gnutls_certificate_credentials_t client_x509_cred, server_x509_cred; gnutls_session_t client_session, server_session; @@ -207,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]; @@ -844,7 +844,9 @@ 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 */ +#endif ; gai_return = getaddrinfo(hostname, port, &gai_hints, &gai_result); if (gai_return != 0) {