Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-29 11:01:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a bug for own disc item and address list

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1897 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
joss17 2009-12-17 22:22:27 +00:00
parent a12084d620
commit 039e41356c
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

34
libretroshare/src/serialiser/rsdiscitems.cc
View file

@ -215,17 +215,17 @@ bool RsDiscSerialiser::serialiseItem(RsDiscOwnItem *item, void *data, uint32
/* add mandatory parts first */ /* add mandatory parts first */
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset, ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset,
TLV_TYPE_IPV4_LOCAL, &(item->laddr)); TLV_TYPE_IPV4_LOCAL, &(item->laddr));
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset, ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset,
TLV_TYPE_IPV4_REMOTE, &(item->saddr)); TLV_TYPE_IPV4_REMOTE, &(item->saddr));
ok &= setRawUInt16(data, tlvsize, &offset, item->contact_tf); ok &= setRawUInt16(data, tlvsize, &offset, item->contact_tf);
ok &= setRawUInt32(data, tlvsize, &offset, item->discFlags); ok &= setRawUInt32(data, tlvsize, &offset, item->discFlags);
//store the ip list //store the ip list There is no private address list for own item
std::list<IpAddressTimed>::iterator ipListIt; // std::list<IpAddressTimed>::iterator ipListIt;
for (ipListIt = item->ipAddressList.begin(); ipListIt!=(item->ipAddressList.end()); ipListIt++) { // for (ipListIt = item->ipAddressList.begin(); ipListIt!=(item->ipAddressList.end()); ipListIt++) {
ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset, TLV_TYPE_IPV4_REMOTE, &(ipListIt->ipAddr)); // ok &= SetTlvIpAddrPortV4(data, tlvsize, &offset, TLV_TYPE_IPV4_REMOTE, &(ipListIt->ipAddr));
ok &= setRawUInt64(data, tlvsize, &offset, ipListIt->seenTime); // ok &= setRawUInt64(data, tlvsize, &offset, ipListIt->seenTime);
} // }
if (offset != tlvsize) if (offset != tlvsize)
{ {
@ -286,16 +286,16 @@ RsDiscOwnItem *RsDiscSerialiser::deserialiseOwnItem(void *data, uint32_t *pktsiz
ok &= getRawUInt32(data, rssize, &offset, &(item->discFlags)); ok &= getRawUInt32(data, rssize, &offset, &(item->discFlags));
//get the ip adress list //get the ip adress list
std::list<IpAddressTimed> ipTimedList; // std::list<IpAddressTimed> ipTimedList;
while (offset < rssize) { // while (offset < rssize) {
IpAddressTimed ipTimed; // IpAddressTimed ipTimed;
ok &= GetTlvIpAddrPortV4(data, rssize, &offset, TLV_TYPE_IPV4_REMOTE, &ipTimed.ipAddr); // ok &= GetTlvIpAddrPortV4(data, rssize, &offset, TLV_TYPE_IPV4_REMOTE, &ipTimed.ipAddr);
uint64_t time; // uint64_t time;
ok &= getRawUInt64(data, rssize, &offset, &time); // ok &= getRawUInt64(data, rssize, &offset, &time);
ipTimed.seenTime = time; // ipTimed.seenTime = time;
ipTimedList.push_back(ipTimed); // ipTimedList.push_back(ipTimed);
} // }
item->ipAddressList = ipTimedList; // item->ipAddressList = ipTimedList;
if (offset != rssize) if (offset != rssize)
{ {

5
libretroshare/src/services/p3disc.cc
View file

@ -360,7 +360,7 @@ void p3disc::sendOwnDetails(std::string to)
di -> PeerId(to); di -> PeerId(to);
di -> laddr = detail.currentlocaladdr; di -> laddr = detail.currentlocaladdr;
di -> saddr = detail.currentserveraddr; di -> saddr = detail.currentserveraddr;
di -> ipAddressList = detail.getIpAddressList(); //di -> ipAddressList = detail.getIpAddressList(); there is no private address list
di -> contact_tf = 0; di -> contact_tf = 0;
/* construct disc flags */ /* construct disc flags */
@ -631,7 +631,8 @@ void p3disc::recvPeerOwnMsg(RsDiscOwnItem *item)
flags |= RS_NET_FLAGS_STABLE_UDP; flags |= RS_NET_FLAGS_STABLE_UDP;
} }
mConnMgr->peerStatus(item->PeerId(), item->laddr, item->saddr, item->ipAddressList, std::list<IpAddressTimed> emptyAddressList; //no address list for own disc message
mConnMgr->peerStatus(item->PeerId(), item->laddr, item->saddr, emptyAddressList,
type, flags, RS_CB_PERSON); type, flags, RS_CB_PERSON);
/* also add as potential stun buddy */ /* also add as potential stun buddy */