From 3172539c55bb15bd4b07b1a013b4ac8bd6dfa51f Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Sun, 15 Mar 2015 15:46:56 +0000
Subject: [PATCH] 0010 Update p3discovery2 with IPv6 if present (Patch from
 G10H4ck)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IPv6@8034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/services/p3discovery2.cc | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/libretroshare/src/services/p3discovery2.cc b/libretroshare/src/services/p3discovery2.cc
index 094599cbe..f96378c6a 100644
--- a/libretroshare/src/services/p3discovery2.cc
+++ b/libretroshare/src/services/p3discovery2.cc
@@ -434,8 +434,16 @@ void p3discovery2::updatePeerAddresses(const RsDiscContactItem *item)
 	}
 	else
 	{
-		mPeerMgr->setLocalAddress(item->sslId, item->localAddrV4.addr);
-		mPeerMgr->setExtAddress(item->sslId, item->extAddrV4.addr);
+		if(!sockaddr_storage_isnull(item->localAddrV6.addr))
+			mPeerMgr->setLocalAddress(item->sslId, item->localAddrV6.addr);
+		else
+			mPeerMgr->setLocalAddress(item->sslId, item->localAddrV4.addr);
+
+		if(!sockaddr_storage_isnull(item->extAddrV6.addr))
+			mPeerMgr->setExtAddress(item->sslId, item->extAddrV6.addr);
+		else
+			mPeerMgr->setExtAddress(item->sslId, item->extAddrV4.addr);
+
 		mPeerMgr->setDynDNS(item->sslId, item->dyndns);
 
 		updatePeerAddressList(item);