* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tcpip.c,v 1.28 2006-09-06 15:01:53 adam Exp $
+ * $Id: tcpip.c,v 1.32 2006-10-13 11:22:26 adam Exp $
*/
/**
* \file tcpip.c
#endif
#ifdef WIN32
+
+/* VS 2003 or later has getaddrinfo; older versions do not */
#include <winsock2.h>
+#if _MSC_VER >= 1300
#include <ws2tcpip.h>
#define HAVE_GETADDRINFO 1
#else
+#define HAVE_GETADDRINFO 0
+#endif
+
+#else
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
sp->ai = tcpip_getaddrinfo(str, port);
if (sp->ai && h->state == CS_ST_UNBND)
{
- int s;
+ int s = -1;
struct addrinfo *ai = sp->ai;
- s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
- if (s < 0)
+ for (; ai; ai = ai->ai_next)
+ {
+ s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if (s != -1)
+ break;
+ }
+ if (s == -1)
return 0;
h->iofile = s;
return 0;
h->iofile = s;
- if (!tcpip_set_blocking(h, h->blocking))
+ if (!tcpip_set_blocking(h, h->flags))
return 0;
}
return &sp->addr;
#ifdef WIN32
BOOL one = 1;
#else
- unsigned long one = 1;
+ int one = 1;
#endif
#if HAVE_GETADDRINFO