@@ -243,7 +243,8 @@ Connection::Resolve (eio_req *req)
243
243
{
244
244
Connection *connection = static_cast <Connection*> (req->data );
245
245
struct addrinfo *address = NULL ;
246
- req->result = getaddrinfo (connection->host_ , connection->port_ , &client_tcp_hints, &address);
246
+ req->result = getaddrinfo (connection->host_ , connection->port_ ,
247
+ &client_tcp_hints, &address);
247
248
req->ptr2 = address;
248
249
249
250
free (connection->host_ );
@@ -264,29 +265,11 @@ AddressDefaultToIPv4 (struct addrinfo *address_list)
264
265
{
265
266
struct addrinfo *address = NULL ;
266
267
267
- /*
268
- char ip4[INET_ADDRSTRLEN], ip6[INET6_ADDRSTRLEN];
269
- for (address = address_list; address != NULL; address = address->ai_next) {
270
- if (address->ai_family == AF_INET) {
271
- struct sockaddr_in *sa = reinterpret_cast<struct sockaddr_in*>(address->ai_addr);
272
- inet_ntop(AF_INET, &(sa->sin_addr), ip4, INET_ADDRSTRLEN);
273
- printf("%s\n", ip4);
274
-
275
- } else if (address->ai_family == AF_INET6) {
276
- struct sockaddr_in6 *sa6 = reinterpret_cast<struct sockaddr_in6*>(address->ai_addr);
277
- inet_ntop(AF_INET6, &(sa6->sin6_addr), ip6, INET6_ADDRSTRLEN);
278
- printf("%s\n", ip6);
279
- }
280
- }
281
- */
282
-
283
268
for (address = address_list; address != NULL ; address = address->ai_next ) {
284
269
if (address->ai_addr ->sa_family == AF_INET) break ;
285
270
}
286
271
287
- if (address == NULL ) address = address_list;
288
-
289
- return address;
272
+ return address == NULL ? address_list : address;
290
273
}
291
274
292
275
int
0 commit comments