diff options
Diffstat (limited to 'otherlibs/unix/addrofstr.c')
| -rw-r--r-- | otherlibs/unix/addrofstr.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/otherlibs/unix/addrofstr.c b/otherlibs/unix/addrofstr.c index 140f9c3b0..5dfcf368d 100644 --- a/otherlibs/unix/addrofstr.c +++ b/otherlibs/unix/addrofstr.c @@ -23,16 +23,25 @@ CAMLprim value unix_inet_addr_of_string(value s) { -#ifdef HAS_INET_ATON +#if defined(HAS_IPV6) + struct in_addr address; + struct in6_addr address6; + if (inet_pton(AF_INET, String_val(s), &address) > 0) + return alloc_inet_addr(&address); + else if (inet_pton(AF_INET6, String_val(s), &address6) > 0) + return alloc_inet6_addr(&address6); + else + failwith("inet_addr_of_string"); +#elif defined(HAS_INET_ATON) struct in_addr address; if (inet_aton(String_val(s), &address) == 0) failwith("inet_addr_of_string"); - return alloc_inet_addr(address.s_addr); + return alloc_inet_addr(&address); #else - unsigned int address; - address = inet_addr(String_val(s)); - if (address == (unsigned int) -1) failwith("inet_addr_of_string"); - return alloc_inet_addr(address); + struct in_addr address; + address.s_addr = inet_addr(String_val(s)); + if (address.s_addr == (uint32) -1) failwith("inet_addr_of_string"); + return alloc_inet_addr(&address); #endif } |