git-svn: trunk@4263
Tomasz Kojm authored on 2008/10/16 17:42:18... | ... |
@@ -124,9 +124,11 @@ static int getclientsock(const char *localip, int prot) |
124 | 124 |
{ |
125 | 125 |
int socketfd = -1; |
126 | 126 |
|
127 |
+#ifdef SUPPORT_IPv6 |
|
127 | 128 |
if(prot == AF_INET6) |
128 | 129 |
socketfd = socket(AF_INET6, SOCK_STREAM, 0); |
129 | 130 |
else |
131 |
+#endif |
|
130 | 132 |
socketfd = socket(AF_INET, SOCK_STREAM, 0); |
131 | 133 |
if(socketfd < 0) { |
132 | 134 |
logg("!Can't create new socket\n"); |
... | ... |
@@ -151,9 +153,11 @@ static int getclientsock(const char *localip, int prot) |
151 | 151 |
} else { |
152 | 152 |
void *addr; |
153 | 153 |
|
154 |
+#ifdef SUPPORT_IPv6 |
|
154 | 155 |
if(res->ai_family == AF_INET6) |
155 | 156 |
addr = &((struct sockaddr_in6 *) res->ai_addr)->sin6_addr; |
156 | 157 |
else |
158 |
+#endif |
|
157 | 159 |
addr = &((struct sockaddr_in *) res->ai_addr)->sin_addr; |
158 | 160 |
|
159 | 161 |
if(inet_ntop(res->ai_family, addr, ipaddr, sizeof(ipaddr))) |
... | ... |
@@ -253,9 +257,11 @@ static int wwwconnect(const char *server, const char *proxy, int pport, char *ip |
253 | 253 |
void *addr; |
254 | 254 |
|
255 | 255 |
ips++; |
256 |
+#ifdef SUPPORT_IPv6 |
|
256 | 257 |
if(rp->ai_family == AF_INET6) |
257 | 258 |
addr = &((struct sockaddr_in6 *) rp->ai_addr)->sin6_addr; |
258 | 259 |
else |
260 |
+#endif |
|
259 | 261 |
addr = &((struct sockaddr_in *) rp->ai_addr)->sin_addr; |
260 | 262 |
|
261 | 263 |
if(!inet_ntop(rp->ai_family, addr, ipaddr, sizeof(ipaddr))) { |