diff options
author | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
---|---|---|
committer | David Walter Seikel | 2012-01-23 23:30:42 +1000 |
commit | 825a3d837a33f226c879cd02ad15c3fba57e8b2c (patch) | |
tree | 75f57bd9c4253508d338dc79ba8e57a7abc42255 /libraries/ecore/src/lib/ecore_con/ecore_con_ares.c | |
parent | Add ability to disable the test harness, or the Lua compile test. (diff) | |
download | SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.zip SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.gz SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.bz2 SledjHamr-825a3d837a33f226c879cd02ad15c3fba57e8b2c.tar.xz |
Update the EFL to what I'm actually using, coz I'm using some stuff not yet released.
Diffstat (limited to '')
-rw-r--r-- | libraries/ecore/src/lib/ecore_con/ecore_con_ares.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libraries/ecore/src/lib/ecore_con/ecore_con_ares.c b/libraries/ecore/src/lib/ecore_con/ecore_con_ares.c index dd5a212..5dfe70b 100644 --- a/libraries/ecore/src/lib/ecore_con/ecore_con_ares.c +++ b/libraries/ecore/src/lib/ecore_con/ecore_con_ares.c | |||
@@ -309,7 +309,7 @@ ecore_con_info_get(Ecore_Con_Server *svr, | |||
309 | memcpy(&cares->hints, hints, sizeof(struct addrinfo)); | 309 | memcpy(&cares->hints, hints, sizeof(struct addrinfo)); |
310 | } | 310 | } |
311 | 311 | ||
312 | if (inet_pton(AF_INET, svr->name, &cares->addr.v4) == 1) | 312 | if (inet_pton(AF_INET, svr->ecs ? svr->ecs->ip : svr->name, &cares->addr.v4) == 1) |
313 | { | 313 | { |
314 | cares->byaddr = EINA_TRUE; | 314 | cares->byaddr = EINA_TRUE; |
315 | cares->isv6 = EINA_FALSE; | 315 | cares->isv6 = EINA_FALSE; |
@@ -320,7 +320,7 @@ ecore_con_info_get(Ecore_Con_Server *svr, | |||
320 | cares); | 320 | cares); |
321 | } | 321 | } |
322 | #ifdef HAVE_IPV6 | 322 | #ifdef HAVE_IPV6 |
323 | else if (inet_pton(AF_INET6, svr->name, &cares->addr.v6) == 1) | 323 | else if (inet_pton(AF_INET6, svr->ecs ? svr->ecs->ip : svr->name, &cares->addr.v6) == 1) |
324 | { | 324 | { |
325 | cares->byaddr = EINA_TRUE; | 325 | cares->byaddr = EINA_TRUE; |
326 | cares->isv6 = EINA_TRUE; | 326 | cares->isv6 = EINA_TRUE; |
@@ -334,7 +334,7 @@ ecore_con_info_get(Ecore_Con_Server *svr, | |||
334 | else | 334 | else |
335 | { | 335 | { |
336 | cares->byaddr = EINA_FALSE; | 336 | cares->byaddr = EINA_FALSE; |
337 | ares_gethostbyname(info_channel, svr->name, ai_family, | 337 | ares_gethostbyname(info_channel, svr->ecs ? svr->ecs->ip : svr->name, ai_family, |
338 | (ares_host_callback)_ecore_con_info_ares_host_cb, | 338 | (ares_host_callback)_ecore_con_info_ares_host_cb, |
339 | cares); | 339 | cares); |
340 | } | 340 | } |
@@ -457,7 +457,7 @@ _ecore_con_info_ares_host_cb(Ecore_Con_CAres *arg, | |||
457 | goto on_mem_error; | 457 | goto on_mem_error; |
458 | 458 | ||
459 | addri->sin_family = AF_INET; | 459 | addri->sin_family = AF_INET; |
460 | addri->sin_port = htons(arg->svr->port); | 460 | addri->sin_port = htons(arg->svr->ecs ? arg->svr->ecs->port : arg->svr->port); |
461 | 461 | ||
462 | memcpy(&addri->sin_addr.s_addr, | 462 | memcpy(&addri->sin_addr.s_addr, |
463 | hostent->h_addr_list[0], sizeof(struct in_addr)); | 463 | hostent->h_addr_list[0], sizeof(struct in_addr)); |
@@ -477,7 +477,7 @@ _ecore_con_info_ares_host_cb(Ecore_Con_CAres *arg, | |||
477 | goto on_mem_error; | 477 | goto on_mem_error; |
478 | 478 | ||
479 | addri6->sin6_family = AF_INET6; | 479 | addri6->sin6_family = AF_INET6; |
480 | addri6->sin6_port = htons(arg->svr->port); | 480 | addri6->sin6_port = htons(arg->svr->ecs ? arg->svr->ecs->port : arg->svr->port); |
481 | addri6->sin6_flowinfo = 0; | 481 | addri6->sin6_flowinfo = 0; |
482 | addri6->sin6_scope_id = 0; | 482 | addri6->sin6_scope_id = 0; |
483 | 483 | ||
@@ -516,7 +516,7 @@ _ecore_con_info_ares_host_cb(Ecore_Con_CAres *arg, | |||
516 | goto on_mem_error; | 516 | goto on_mem_error; |
517 | 517 | ||
518 | addri6->sin6_family = AF_INET6; | 518 | addri6->sin6_family = AF_INET6; |
519 | addri6->sin6_port = htons(arg->svr->port); | 519 | addri6->sin6_port = htons(arg->svr->ecs ? arg->svr->ecs->port : arg->svr->port); |
520 | addri6->sin6_flowinfo = 0; | 520 | addri6->sin6_flowinfo = 0; |
521 | addri6->sin6_scope_id = 0; | 521 | addri6->sin6_scope_id = 0; |
522 | 522 | ||
@@ -537,7 +537,7 @@ _ecore_con_info_ares_host_cb(Ecore_Con_CAres *arg, | |||
537 | goto on_mem_error; | 537 | goto on_mem_error; |
538 | 538 | ||
539 | addri->sin_family = AF_INET; | 539 | addri->sin_family = AF_INET; |
540 | addri->sin_port = htons(arg->svr->port); | 540 | addri->sin_port = htons(arg->svr->ecs ? arg->svr->ecs->port : arg->svr->port); |
541 | 541 | ||
542 | memcpy(&addri->sin_addr.s_addr, | 542 | memcpy(&addri->sin_addr.s_addr, |
543 | &arg->addr.v4, sizeof(struct in_addr)); | 543 | &arg->addr.v4, sizeof(struct in_addr)); |