Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-28 18:42:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

A series of small bugfixes - as we head towards the first v0.4 release.

Browse source 
* Added stun bootstrap functionality.
 * Added in two temporary StunServers.
 * Reconnect attempts are TCP only.
 * enabled AUTOCONNECT and TCP Connections.
 * reduced UDP keepAlive timer to 15 secs.
 * made UPnP the default startup behaviour.
 * Removed StunId raw printouts -> now use BinToHex()
 * Unified TTLS and PERIODS in p3dhtmgr.h
 * DHT bugfix (data not passed to ConnMgr).




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@370 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-03-03 14:01:52 +00:00
parent 63828f77a8
commit 85aa75ef5d
10 changed files with 110 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/serialiser/rsconfigitems.cc
View file

@ -743,7 +743,7 @@ std::ostream &RsPeerStunItem::print(std::ostream &out, uint16_t indent)
printRsItemBase(out, "RsPeerStunItem", indent);
uint16_t int_Indent = indent + 2;
stunList.print(out, int_Indent);
stunList.printHex(out, int_Indent);
printRsItemEnd(out, "RsPeerStunItem", indent);
return out;

20
libretroshare/src/serialiser/rstlvtypes.cc
View file

@ -27,6 +27,7 @@
#include "rstlvbase.h"
#include "rstlvtypes.h"
#include "rsbaseserial.h"
#include "util/rsprint.h"
#include <ostream>
#include <sstream>
#include <iomanip>
@ -322,6 +323,25 @@ std::ostream &RsTlvPeerIdSet::print(std::ostream &out, uint16_t indent)
}
/// print to screen RsTlvPeerIdSet contents
std::ostream &RsTlvPeerIdSet::printHex(std::ostream &out, uint16_t indent)
{
printBase(out, "RsTlvPeerIdSet", indent);
uint16_t int_Indent = indent + 2;
std::list<std::string>::iterator it;
for(it = ids.begin(); it != ids.end() ; ++it)
{
printIndent(out, int_Indent);
out << "id: 0x" << RsUtil::BinToHex(*it);
out << std::endl;
}
printEnd(out, "RsTlvPeerIdSet", indent);
return out;
}
/************************************* Service Id Set ************************************/

1
libretroshare/src/serialiser/rstlvtypes.h
View file

@ -150,6 +150,7 @@ virtual void TlvClear();
virtual bool SetTlv(void *data, uint32_t size, uint32_t *offset); /* serialise */
virtual bool GetTlv(void *data, uint32_t size, uint32_t *offset); /* deserialise */
virtual std::ostream &print(std::ostream &out, uint16_t indent);
virtual std::ostream &printHex(std::ostream &out, uint16_t indent); /* SPECIAL One */
std::list<std::string> ids; /* Mandatory */
};