Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-06 13:24:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

0009 populate RsDisContactItem with IPv6 too (Patch from G10H4ck)

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IPv6@8033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2015-03-15 15:45:49 +00:00
parent 7096a61e21
commit 3d299253d3
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libretroshare/src/services/p3discovery2.cc
View file

@ -62,9 +62,16 @@ bool populateContactInfo(const peerState &detail, RsDiscContactItem *pkt)
pkt->isHidden = false; pkt->isHidden = false;
pkt->localAddrV4.addr = detail.localaddr; pkt->localAddrV4.addr = detail.localaddr;
if(!sockaddr_storage_ipv6_to_ipv4(pkt->localAddrV4.addr)) sockaddr_storage_clear(pkt->localAddrV4.addr);
pkt->extAddrV4.addr = detail.serveraddr; pkt->extAddrV4.addr = detail.serveraddr;
sockaddr_storage_clear(pkt->localAddrV6.addr); if(!sockaddr_storage_ipv6_to_ipv4(pkt->extAddrV4.addr)) sockaddr_storage_clear(pkt->extAddrV4.addr);
sockaddr_storage_clear(pkt->extAddrV6.addr);
pkt->localAddrV6.addr = detail.localaddr;
if (!sockaddr_storage_ipv4_to_ipv6(pkt->localAddrV6.addr)) sockaddr_storage_clear(pkt->localAddrV6.addr);
pkt->extAddrV6.addr = detail.serveraddr;
if(!sockaddr_storage_ipv4_to_ipv6(pkt->extAddrV6.addr)) sockaddr_storage_clear(pkt->extAddrV6.addr);
pkt->dyndns = detail.dyndns; pkt->dyndns = detail.dyndns;
detail.ipAddrs.mLocal.loadTlv(pkt->localAddrList); detail.ipAddrs.mLocal.loadTlv(pkt->localAddrList);

9
libretroshare/src/util/rsnet_ss.cc
View file

@ -304,9 +304,9 @@ bool sockaddr_storage_ipv4_to_ipv6(sockaddr_storage &addr)
bool sockaddr_storage_ipv6_to_ipv4(sockaddr_storage &addr) bool sockaddr_storage_ipv6_to_ipv4(sockaddr_storage &addr)
{ {
//#ifdef SS_DEBUG #ifdef SS_DEBUG
std::cerr << "sockaddr_storage_ipv6_to_ipv4(sockaddr_storage &addr)" << std::endl; std::cerr << "sockaddr_storage_ipv6_to_ipv4(sockaddr_storage &addr)" << std::endl;
//#endif #endif
if ( addr.ss_family == AF_INET ) return true; if ( addr.ss_family == AF_INET ) return true;
@ -801,8 +801,9 @@ bool sockaddr_storage_ipv6_lessthan(const struct sockaddr_storage &addr, const s
bool sockaddr_storage_ipv6_same(const struct sockaddr_storage &addr, const struct sockaddr_storage &addr2) bool sockaddr_storage_ipv6_same(const struct sockaddr_storage &addr, const struct sockaddr_storage &addr2)
{ {
std::cerr << "sockaddr_storage_ipv6_same()"; #ifdef SS_DEBUG
std::cerr << std::endl; std::cerr << "sockaddr_storage_ipv6_same()" << std::endl;
#endif
const struct sockaddr_in6 *ptr1 = to_const_ipv6_ptr(addr); const struct sockaddr_in6 *ptr1 = to_const_ipv6_ptr(addr);
const struct sockaddr_in6 *ptr2 = to_const_ipv6_ptr(addr2); const struct sockaddr_in6 *ptr2 = to_const_ipv6_ptr(addr2);