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

mods to support hidden node: setup & cert sharing.

Browse source 
Also removed old configuration mode from p3cfgmgr



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2013-09-09 02:10:49 +00:00
parent 683e75aeef
commit bfd915864b
13 changed files with 387 additions and 919 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libretroshare/src/retroshare/rsinit.h
View file

@ -44,6 +44,7 @@
#include <list>
#include <map>
#include <vector>
#include <stdint.h>
/*!
* Initialisation Class (not publicly disclosed to RsIFace)
@ -95,6 +96,12 @@ class RsInit
// copies existing gnupg keyrings to the new place of the OpenPGP-SDK version. Returns true on success.
static bool copyGnuPGKeyrings() ;
/*!
* Setup Hidden Location;
*/
static bool SetHiddenLocation(const std::string& hiddenaddress, uint16_t port);
/*!
* Login GGP
*/

9
libretroshare/src/retroshare/rspeers.h
View file

@ -54,7 +54,8 @@ const uint32_t RS_TRUST_LVL_ULTIMATE = 5;
const uint32_t RS_NETMODE_UDP = 0x0001;
const uint32_t RS_NETMODE_UPNP = 0x0002;
const uint32_t RS_NETMODE_EXT = 0x0003;
const uint32_t RS_NETMODE_UNREACHABLE = 0x0004;
const uint32_t RS_NETMODE_HIDDEN = 0x0004;
const uint32_t RS_NETMODE_UNREACHABLE = 0x0005;
/* Visibility */
const uint32_t RS_VS_DHT_ON = 0x0001;
@ -206,6 +207,10 @@ class RsPeerDetails
/* Network details (only valid if friend) */
uint32_t state;
bool isHiddenNode;
std::string hiddenNodeAddress;
// Filled in for Standard Node.
std::string localAddr;
uint16_t localPort;
std::string extAddr;
@ -310,6 +315,8 @@ class RsPeers
/* Network Stuff */
virtual bool connectAttempt(const std::string &ssl_id) = 0;
virtual bool setLocation(const std::string &ssl_id, const std::string &location) = 0;//location is shown in the gui to differentiate ssl certs
virtual bool setHiddenNode(const std::string &id, const std::string &hidden_node_address) = 0;
virtual bool setLocalAddress(const std::string &ssl_id, const std::string &addr, uint16_t port) = 0;
virtual bool setExtAddress( const std::string &ssl_id, const std::string &addr, uint16_t port) = 0;
virtual bool setDynDNS(const std::string &id, const std::string &addr) = 0;