diff options
| author | Erlang/OTP <[email protected]> | 2010-04-14 06:16:22 +0000 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2010-04-14 06:16:22 +0000 |
| commit | 1aa3a061cfa397acba8afd4eb9a3765b4292156c (patch) | |
| tree | cb6b82add3a4a65204a81c318000124ca9e438c3 /erts | |
| parent | e313bb4982f50ab15687d5063be7bfa2a6c4f76c (diff) | |
| parent | 89a89441d0dab3e451fcadec5f2151b4d5ca794f (diff) | |
| download | otp-1aa3a061cfa397acba8afd4eb9a3765b4292156c.tar.gz otp-1aa3a061cfa397acba8afd4eb9a3765b4292156c.tar.bz2 otp-1aa3a061cfa397acba8afd4eb9a3765b4292156c.zip | |
Merge branch 'jb/inet6-dist' into dev
* jb/inet6-dist:
Support IPv6 addresses in long host names
Fix implementation of IPv6 TCP distribution protocol
Fix compilation of epmd with IPv6 enabled
OTP-8575 jb/inet6-dist
Diffstat (limited to 'erts')
| -rw-r--r-- | erts/epmd/src/epmd_int.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/erts/epmd/src/epmd_int.h b/erts/epmd/src/epmd_int.h index 65fcf9bacb..0e432e2cb0 100644 --- a/erts/epmd/src/epmd_int.h +++ b/erts/epmd/src/epmd_int.h @@ -192,26 +192,18 @@ #define FAMILY AF_INET6 #define SET_ADDR_LOOPBACK(addr, af, port) do { \ - static u_int32_t __addr[4] = IN6ADDR_LOOPBACK_INIT; \ memset((char*)&(addr), 0, sizeof(addr)); \ (addr).sin6_family = (af); \ (addr).sin6_flowinfo = 0; \ - (addr).sin6_addr.s6_addr32[0] = __addr[0]; \ - (addr).sin6_addr.s6_addr32[1] = __addr[1]; \ - (addr).sin6_addr.s6_addr32[2] = __addr[2]; \ - (addr).sin6_addr.s6_addr32[3] = __addr[3]; \ + (addr).sin6_addr = in6addr_loopback; \ (addr).sin6_port = htons(port); \ } while(0) #define SET_ADDR_ANY(addr, af, port) do { \ - static u_int32_t __addr[4] = IN6ADDR_ANY_INIT; \ memset((char*)&(addr), 0, sizeof(addr)); \ (addr).sin6_family = (af); \ (addr).sin6_flowinfo = 0; \ - (addr).sin6_addr.s6_addr32[0] = __addr[0]; \ - (addr).sin6_addr.s6_addr32[1] = __addr[1]; \ - (addr).sin6_addr.s6_addr32[2] = __addr[2]; \ - (addr).sin6_addr.s6_addr32[3] = __addr[3]; \ + (addr).sin6_addr = in6addr_any; \ (addr).sin6_port = htons(port); \ } while(0) |