Add IPv6 support

Implement tds_getaddrinfo and family as replacements is getaddrinfo (is
not present).
Use them instead of classic IPv4 versions.

Signed-off-by: Peter Deacon <peterd@iea-software.com>
Signed-off-by: Frediano Ziglio <freddy77@gmail.com>

Author: Peter Deacon

include/replacements.h

@@ -88,6 +88,27 @@ char *strsep(char **stringp, const char *delim);
 size_t tds_strlcpy(char *dest, const char *src, size_t len);
 #endif
 
+#if HAVE_GETADDRINFO
+#define tds_addrinfo addrinfo
+#define tds_getaddrinfo getaddrinfo
+#define tds_getnameinfo getnameinfo
+#define tds_freeaddrinfo freeaddrinfo
+#else
+typedef struct tds_addrinfo {
+	int ai_flags;
+	int ai_family;
+	int ai_socktype;
+	int ai_protocol;
+	size_t ai_addrlen;
+	struct sockaddr *ai_addr;
+	struct tds_addrinfo *ai_next;
+} tds_addrinfo;
+
+int tds_getaddrinfo(const char *node, const char *service, const struct tds_addrinfo *hints, struct tds_addrinfo **res);
+int tds_getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags);
+void tds_freeaddrinfo(struct tds_addrinfo *addr);
+#endif
+
 #if HAVE_STRLCAT
 #define tds_strlcat(d,s,l) strlcat(d,s,l)
 #else

include/tds.h

@@ -31,6 +31,10 @@
 #include <stddef.h>
 #endif
 
+#if HAVE_NETDB_H
+#include <netdb.h>
+#endif /* HAVE_NETDB_H */
+
 #if HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif /* HAVE_NET_INET_IN_H */
@@ -48,6 +52,7 @@ typedef struct tds_column TDSCOLUMN;
 #include "tds_sysdep_public.h"
 #include "tds_sysdep_private.h"
 #include "tdsthread.h"
+#include "replacements.h"
 
 #if defined(__GNUC__) && __GNUC__ >= 4 && !defined(__MINGW32__)
 #pragma GCC visibility push(hidden)
@@ -556,7 +561,8 @@ typedef struct tds_login
 	DSTR client_charset;
 	DSTR database;
 
-	DSTR ip_addr;	  	/**< ip of server */
+	struct tds_addrinfo *ip_addrs;	  		/**< ip(s) of server */
+	struct tds_addrinfo *connected_addr;	/* ip of connected server */
 	DSTR instance_name;
 	DSTR dump_file;
 	int debug_flags;
@@ -1174,7 +1180,10 @@ void tds_parse_conf_section(const char *option, const char *value, void *param);
 TDSLOGIN *tds_read_config_info(TDSSOCKET * tds, TDSLOGIN * login, TDSLOCALE * locale);
 void tds_fix_login(TDSLOGIN* login);
 TDS_USMALLINT * tds_config_verstr(const char *tdsver, TDSLOGIN* login);
-TDSRET tds_lookup_host(const char *servername, char *ip);
+struct tds_addrinfo *tds_lookup_host(const char *servername);
+TDSRET tds_lookup_host_set(const char *servername, struct tds_addrinfo **addr);
+TDSRET tds_addrinfo2str(struct tds_addrinfo *addr, char *name, int namemax);
+
 TDSRET tds_set_interfaces_file_loc(const char *interfloc);
 extern const char STD_DATETIME_FMT[];
 int tds_config_boolean(const char *value);
@@ -1383,10 +1392,10 @@ extern int tds_debug_flags;
 extern int tds_g_append_mode;
 
 /* net.c */
-TDSERRNO tds_open_socket(TDSSOCKET * tds, const char *ip_addr, unsigned int port, int timeout, int *p_oserr);
+TDSERRNO tds_open_socket(TDSSOCKET * tds, struct tds_addrinfo *ipaddr, unsigned int port, int timeout, int *p_oserr);
 void tds_close_socket(TDSSOCKET * tds);
-int tds7_get_instance_ports(FILE *output, const char *ip_addr);
-int tds7_get_instance_port(const char *ip_addr, const char *instance);
+int tds7_get_instance_ports(FILE *output, struct tds_addrinfo *addr);
+int tds7_get_instance_port(struct tds_addrinfo *addr, const char *instance);
 TDSRET tds_ssl_init(TDSSOCKET *tds);
 void tds_ssl_deinit(TDSCONNECTION *conn);
 const char *tds_prwsaerror(int erc);

include/tds_sysdep_private.h

@@ -70,6 +70,8 @@ typedef int pid_t;
 
 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64)
 #include <winsock2.h>
+#include <ws2tcpip.h>
+#include <wspiapi.h>
 #include <windows.h>
 #define READSOCKET(a,b,c)	recv((a), (char *) (b), (c), TDS_NOSIGNAL)
 #define WRITESOCKET(a,b,c)	send((a), (const char *) (b), (c), TDS_NOSIGNAL)

src/apps/tsql.c

@@ -395,14 +395,17 @@ get_opt_flags(char *s, int *opt_flags)
 static int
 get_default_instance_port(const char hostname[])
 {
-	char ip[24] = {'\0'};
+	int port;
+	struct tds_addrinfo *addr;
 
-	tds_lookup_host(hostname, ip);
-	
-	if (!*ip) 
+	if ((addr = tds_lookup_host(hostname)) == NULL)
 		return 0;
+
+	port = tds7_get_instance_port(addr, "MSSQLSERVER");
+
+	tds_freeaddrinfo(addr);
 
-	return tds7_get_instance_port(ip, "MSSQLSERVER");
+	return port;
 }
 
 #if !defined(LC_ALL)
@@ -519,7 +522,7 @@ populate_login(TDSLOGIN * login, int argc, char **argv)
 
 	if ((global_opt_flags & OPT_INSTANCES) && hostname) {
 		static const char template[] = "%s.instances";
-		char ip[24] = {'\0'};
+		struct tds_addrinfo *addr;
 		char *filename = getenv("TDSDUMP");
 
 		if (filename) {
@@ -529,8 +532,10 @@ populate_login(TDSLOGIN * login, int argc, char **argv)
 			tdsdump_open(filename);
 			free(filename);
 		}
-		tds_lookup_host(hostname, ip);
-		tds7_get_instance_ports(stderr, ip);
+		if ((addr = tds_lookup_host(hostname)) != NULL) {
+			tds7_get_instance_ports(stderr, addr);
+			tds_freeaddrinfo(addr);
+		}
 		tdsdump_close();
 		exit(0);
 	}

src/odbc/connectparams.c

@@ -108,7 +108,6 @@ static int SQLGetPrivateProfileString(LPCSTR pszSection, LPCSTR pszEntry, LPCSTR
 static int
 parse_server(TDS_ERRS *errs, char *server, TDSLOGIN * login)
 {
-	char ip[64];
 	char *p = (char *) strchr(server, '\\');
 
 	if (p) {
@@ -125,14 +124,9 @@ parse_server(TDS_ERRS *errs, char *server, TDSLOGIN * login)
 		}
 	}
 
-	if (TDS_SUCCEED(tds_lookup_host(server, ip)))
+	if (TDS_SUCCEED(tds_lookup_host_set(server, &login->ip_addrs)))
 		tds_dstr_copy(&login->server_host_name, server);
 
-	if (!tds_dstr_copy(&login->ip_addr, ip)) {
-		odbc_errs_add(errs, "HY001", NULL);
-		return 0;
-	}
-
 	return 1;
 }
 
@@ -177,8 +171,8 @@ odbc_get_dsn_info(TDS_ERRS *errs, const char *DSN, TDSLOGIN * login)
 		if (myGetPrivateProfileString(DSN, odbc_param_Address, tmp) > 0) {
 			address_specified = 1;
 			/* TODO parse like MS */
-			tds_lookup_host(tmp, tmp);
-			tds_dstr_copy(&login->ip_addr, tmp);
+
+			tds_lookup_host_set(tmp, &login->ip_addrs);
 		}
 		if (myGetPrivateProfileString(DSN, odbc_param_Server, tmp) > 0) {
 			tds_dstr_copy(&login->server_name, tmp);

src/replacements/Makefile.am

@@ -11,6 +11,7 @@ EXTRA_DIST=	asprintf.c \
 		getopt.c \
 		readpassphrase.c \
 		strlcat.c \
+		getaddrinfo.c \
 		strlcpy.c \
 		strtok_r.c \
 		strsep.c \

src/replacements/getaddrinfo.c

@@ -0,0 +1,111 @@
+/* FreeTDS - Library of routines accessing Sybase and Microsoft databases
+ * Copyright (C) 2013 Peter Deacon
+ * Copyright (C) 2013 Ziglio Frediano
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include <config.h>
+
+#if !defined(HAVE_GETADDRINFO)
+#include <assert.h>
+
+#include "tds.h"
+#include "tds_sysdep_private.h"
+#include "replacements.h"
+
+/* Incomplete implementation, single ipv4 addr, service does not work, hints do not work */
+int
+tds_getaddrinfo(const char *node, const char *service, const struct tds_addrinfo *hints, struct tds_addrinfo **res)
+{
+	int retcode = 0;
+	struct tds_addrinfo *addr;
+	struct sockaddr_in *sin, *s;
+	struct hostent *host = NULL;
+	unsigned int ipaddr;
+	char buffer[4096];
+	struct hostent result;
+	int h_errnop;
+
+	assert(node != NULL);
+
+	if ((addr = (tds_addrinfo *) malloc(sizeof(struct tds_addrinfo))) != NULL)
+		memset(addr, '\0', sizeof(struct tds_addrinfo));
+	else
+		retcode = -1;
+
+	if ((sin = (struct sockaddr_in *) malloc(sizeof(struct sockaddr_in))) != NULL)
+		memset(sin, '\0', sizeof(struct sockaddr_in));
+	else
+		retcode = -1;
+
+	if (retcode == 0) {
+		addr->ai_addr = (struct sockaddr *) sin;
+		addr->ai_addrlen = sizeof(struct sockaddr_in);
+		addr->ai_family = AF_INET;
+		sin = NULL;
+
+		if ((ipaddr = inet_addr(node)) == INADDR_NONE) {
+			if ((host = tds_gethostbyname_r(node, &result, buffer, sizeof(buffer), &h_errnop)) != NULL)
+				ipaddr = *(unsigned int *) host->h_addr;
+			else
+				retcode = -1;
+		}
+	} else
+		retcode = -1;
+
+	if (retcode == 0) {
+		s = (struct sockaddr_in *) addr->ai_addr;
+		s->sin_family = AF_INET;
+		s->sin_addr.s_addr = ipaddr;
+		s->sin_port = htons(atoi(service));
+
+		*res = addr;
+		addr = NULL;
+	}
+
+	if (addr != NULL)
+		tds_freeaddrinfo(addr);
+
+	if (sin != NULL)
+		free(sin);
+
+	return retcode;
+}
+
+/* Incomplete implementation, ipv4 only, port does not work, flags do not work */
+int
+tds_getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
+{
+	int retcode = 0;
+	struct sockaddr_in *sin = (struct sockaddr_in *) sa;
+
+	if (host != NULL)
+		tds_inet_ntoa_r(sin->sin_addr, host, hostlen);
+
+	return retcode;
+}
+
+void
+tds_freeaddrinfo(struct tds_addrinfo *addr)
+{
+	assert(addr != NULL);
+	if (addr->ai_addr != NULL)
+		free(addr->ai_addr);
+	free(addr);
+}
+
+#endif