Fixed the Missing Cache File bug.

* Added Old Cache Storage... so these can be retrieved.
 * Connected up the CancelCacheFile() -> FileCancel.

Other Changes.
 * Removed ipaddr = 1 bug (thought someone else had commited this earlier???)
 * added #ifdefs to remove debugging output in p3BitDht.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4330 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-06-24 15:10:52 +00:00
parent ee278b45b7
commit a333b12618
5 changed files with 97 additions and 13 deletions

View file

@ -600,13 +600,7 @@ bool SetTlvIpAddrPortV4(void *data, uint32_t size, uint32_t *offset,
ok &= SetTlvBase(data, tlvend, offset, type, tlvsize);
sockaddr_in addr = *out;
//it looks like if ip or port is null that there is a problem
if (addr.sin_addr.s_addr == 0) {
addr.sin_addr.s_addr = 1;
}
if (addr.sin_port == 0) {
addr.sin_port = 1;
}
/* now add the data .... (its already in network order) - so flip */
uint32_t ipaddr = addr.sin_addr.s_addr;
ok &= setRawUInt32(data, tlvend, offset, ntohl(ipaddr));