@@ -113,3 +113,4 @@ daemons saslauthd and pwcheck. 19Jan08: Supported IPv6 addresses. 30Apr08: Set the NODELAY option on sockets that we connect to other servers. Omission noted by Roger Pack. +14May08: Generated a 0.12 release. ChangeLog @@ -1181,7 +1181,7 @@ struct sockaddr *name2address (const char *server, int port, int *family, int *b if (!server || !*server) server = "0.0.0.0"; - bzero (&in4, sizeof(in4)); + memset (&in4, 0, sizeof(in4)); if ( (in4.sin_addr.s_addr = inet_addr (server)) != INADDR_NONE) { if (family) *family = AF_INET; @@ -1192,7 +1192,8 @@ struct sockaddr *name2address (const char *server, int port, int *family, int *b return (struct sockaddr*)&in4; } - bzero (&in6, sizeof(in6)); + #ifdef OS_UNIX + memset (&in6, 0, sizeof(in6)); if (inet_pton (AF_INET6, server, in6.sin6_addr.s6_addr) > 0) { if (family) *family = AF_INET6; @@ -1202,6 +1203,15 @@ struct sockaddr *name2address (const char *server, int port, int *family, int *b in6.sin6_port = htons (port); return (struct sockaddr*)&in6; } + #endif + + #ifdef OS_WIN32 + // TODO, must complete this branch. Windows doesn't have inet_pton. + // A possible approach is to make a getaddrinfo call with the supplied + // server address, constraining the hints to ipv6 and seeing if we + // get any addresses. + // For the time being, Ipv6 addresses aren't supported on Windows. + #endif hp = gethostbyname ((char*)server); // Windows requires the cast. if (hp) { ext/em.cpp @@ -76,7 +76,8 @@ typedef int SOCKET; #ifdef OS_WIN32 #define WIN32_LEAN_AND_MEAN #include <windows.h> -#include <winsock.h> +#include <winsock2.h> +#include <ws2tcpip.h> #include <rpc.h> #include <fcntl.h> #include <assert.h> ext/project.h @@ -25,7 +25,7 @@ module EventMachine - VERSION = "0.11.0" + VERSION = "0.12.0" end lib/eventmachine_version.rb e79cfa214ce460108956db2a09135a1c68903e3f francis francis@2c60eb90-88cd-488e-9351-1edcb1d70dbc http://github.com/espace/eventmachine/commit/28e51a847b66c846f00c00154225d7f0458efd17 28e51a847b66c846f00c00154225d7f0458efd17 2008-05-14T14:21:10-07:00 2008-05-14T14:21:10-07:00 Tweaked includes and some code so that the IPv6 support will compile on Windows. git-svn-id: http://rubyeventmachine.com/svn/trunk@686 2c60eb90-88cd-488e-9351-1edcb1d70dbc 107e578cdaaf2b68666b45d9acaec13a3e2a47c8 francis francis@2c60eb90-88cd-488e-9351-1edcb1d70dbc