generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- This issue raised by the chromium team when clang compiler is used. This was not an error as in this case we were accessing IPV6 address with IPV4 struct which is defined as 14 bytes in the header file, but we had the runtime check to determine the address space.

Browse Source 
Now the solution is to use IPV6 structures instead of IPV4 when address space is determined.

I haven't put the new solution behind AF_INET6 flag, as i don't think it's necessary. 
Review URL: http://webrtc-codereview.appspot.com/291014

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1138 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mallinath@webrtc.org 2011-12-08 21:37:19 +00:00
parent c853aa1735
commit 7766e2a82d
1 changed files with 19 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/modules/udp_transport/source/udp_transport_impl.cc
View File

@ -2472,7 +2472,7 @@ WebRtc_Word32 UdpTransport::InetPresentationToNumeric(WebRtc_Word32 af,
#endif
}
WebRtc_Word32 UdpTransport::LocalHostAddressIPV6(WebRtc_UWord8 localIP[16])
WebRtc_Word32 UdpTransport::LocalHostAddressIPV6(WebRtc_UWord8 n_localIP[16])
{
WEBRTC_TRACE(kTraceModuleCall, kTraceTransport, -1, "%s", __FUNCTION__);
@ -2506,20 +2506,21 @@ WebRtc_Word32 UdpTransport::LocalHostAddressIPV6(WebRtc_UWord8 localIP[16])
{
for(int i = 0; i< 16; i++)
{
localIP[i] = (*(SocketAddress*)ptr->ai_addr)._sockaddr_in6.sin6_addr.Version6AddressUnion._s6_u8[i];
n_localIP[i] = (*(SocketAddress*)ptr->ai_addr).
_sockaddr_in6.sin6_addr.Version6AddressUnion._s6_u8[i];
}
bool islocalIP = true;
for(int n = 0; n< 15; n++)
{
if(localIP[n] != 0)
if(n_localIP[n] != 0)
{
islocalIP = false;
break;
}
}
if(islocalIP && localIP[15] != 1)
if(islocalIP && n_localIP[15] != 1)
{
islocalIP = false;
}
@ -2528,7 +2529,8 @@ WebRtc_Word32 UdpTransport::LocalHostAddressIPV6(WebRtc_UWord8 localIP[16])
{
continue;
}
if(localIP[0] == 0xfe && localIP[1] == 0x80 && ptr->ai_next)
if(n_localIP[0] == 0xfe &&
n_localIP[1] == 0x80 && ptr->ai_next)
{
continue;
}
@ -2554,35 +2556,18 @@ WebRtc_Word32 UdpTransport::LocalHostAddressIPV6(WebRtc_UWord8 localIP[16])
{
if(ptrIfAddrs->ifa_addr->sa_family == AF_INET6)
{
bool islocalIP = true;
for(int n = 2; n< 15; n++)
{
if(ptrIfAddrs->ifa_addr->sa_data[n+6] != 0)
{
islocalIP = false;
break;
}
}
if(islocalIP && ptrIfAddrs->ifa_addr->sa_data[15+6] != 1)
{
islocalIP = false;
}
const struct sockaddr_in6* sock_in6 =
reinterpret_cast<struct sockaddr_in6*>(ptrIfAddrs->ifa_addr);
const struct in6_addr* sin6_addr = &sock_in6->sin6_addr;
if(!islocalIP)
{
for(int i = 0; i< 16; i++)
{
localIP[i] = ptrIfAddrs->ifa_addr->sa_data[i+6];
}
if(localIP[0] == 0xfe && localIP[1] == 0x80 &&
ptrIfAddrs->ifa_next)
{
ptrIfAddrs = ptrIfAddrs->ifa_next;
continue;
}
freeifaddrs(ptrIfAddrsStart);
return 0;
if (IN6_IS_ADDR_LOOPBACK(sin6_addr) ||
IN6_IS_ADDR_LINKLOCAL(sin6_addr)) {
ptrIfAddrs = ptrIfAddrs->ifa_next;
continue;
}
memcpy(n_localIP, sin6_addr->s6_addr, sizeof(sin6_addr->s6_addr));
freeifaddrs(ptrIfAddrsStart);
return 0;
}
ptrIfAddrs = ptrIfAddrs->ifa_next;
}
@ -2705,9 +2690,9 @@ WebRtc_Word32 UdpTransport::LocalHostAddressIPV6(WebRtc_UWord8 localIP[16])
{
for(int i = 0; i< 16; i++)
{
localIP[i] = in6p->s6_addr[i];
n_localIP[i] = in6p->s6_addr[i];
}
if(localIP[0] == 0xfe && localIP[1] == 0x80)
if(n_localIP[0] == 0xfe && n_localIP[1] == 0x80)
{
// Auto configured IP.
continue;