mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-25 09:11:06 -04:00
Commit of the new UDP Connection methods and
the rewrite of the retroshare core networking stack. This check-in commits the changes to the rsserver code. Major changes to use the new networking code. Added p3peers.h as a new interface for peer/neighbour management. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob
parent
7c2d5611bd
commit
fd8adceb7e
13 changed files with 1039 additions and 701 deletions
635
libretroshare/src/rsserver/p3peers.cc
Normal file
635
libretroshare/src/rsserver/p3peers.cc
Normal file
|
|
@ -0,0 +1,635 @@
|
|||
/*
|
||||
* libretroshare/src/rsserver: p3peers.cc
|
||||
*
|
||||
* RetroShare C++ Interface.
|
||||
*
|
||||
* Copyright 2004-2008 by Robert Fernie.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Library General Public
|
||||
* License Version 2 as published by the Free Software Foundation.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Library General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Library General Public
|
||||
* License along with this library; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
||||
* USA.
|
||||
*
|
||||
* Please report all bugs and problems to "retroshare@lunamutt.com".
|
||||
*
|
||||
*/
|
||||
|
||||
#include "rsserver/p3peers.h"
|
||||
#include "pqi/p3connmgr.h"
|
||||
#include "pqi/p3authmgr.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <sstream>
|
||||
|
||||
RsPeers *rsPeers = NULL;
|
||||
|
||||
static uint32_t RsPeerTranslateTrust(uint32_t trustLvl);
|
||||
int ensureExtension(std::string &name, std::string def_ext);
|
||||
|
||||
std::string RsPeerTrustString(uint32_t trustLvl)
|
||||
{
|
||||
std::string str;
|
||||
if (trustLvl == RS_TRUST_LVL_GOOD)
|
||||
{
|
||||
str = "Good";
|
||||
}
|
||||
else if (trustLvl == RS_TRUST_LVL_MARGINAL)
|
||||
{
|
||||
str = "Marginal";
|
||||
}
|
||||
else
|
||||
{
|
||||
str = "No Trust";
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
|
||||
|
||||
std::string RsPeerStateString(uint32_t state)
|
||||
{
|
||||
std::string str;
|
||||
if (state & RS_PEER_STATE_CONNECTED)
|
||||
{
|
||||
str = "Connected";
|
||||
}
|
||||
else if (state & RS_PEER_STATE_ONLINE)
|
||||
{
|
||||
str = "Available";
|
||||
}
|
||||
else if (state & RS_PEER_STATE_FRIEND)
|
||||
{
|
||||
str = "Offline";
|
||||
}
|
||||
else
|
||||
{
|
||||
str = "Neighbour";
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
std::string RsPeerNetModeString(uint32_t netModel)
|
||||
{
|
||||
std::string str;
|
||||
if (netModel == RS_NETMODE_EXT)
|
||||
{
|
||||
str = "External Port";
|
||||
}
|
||||
else if (netModel == RS_NETMODE_UPNP)
|
||||
{
|
||||
str = "Ext (UPnP)";
|
||||
}
|
||||
else if (netModel == RS_NETMODE_UDP)
|
||||
{
|
||||
str = "UDP Mode";
|
||||
}
|
||||
else
|
||||
{
|
||||
str = "Unknown NetMode";
|
||||
}
|
||||
return str;
|
||||
}
|
||||
|
||||
|
||||
std::string RsPeerLastConnectString(uint32_t lastConnect)
|
||||
{
|
||||
std::ostringstream out;
|
||||
out << lastConnect << " secs ago";
|
||||
return out.str();
|
||||
}
|
||||
|
||||
#define P3PEERS_DEBUG 1
|
||||
|
||||
p3Peers::p3Peers(p3ConnectMgr *cm, p3AuthMgr *am)
|
||||
:mConnMgr(cm), mAuthMgr(am)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
/* Updates ... */
|
||||
bool p3Peers::FriendsChanged()
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::FriendsChanged()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* TODO */
|
||||
return false;
|
||||
}
|
||||
|
||||
bool p3Peers::OthersChanged()
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::OthersChanged()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* TODO */
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Peer Details (Net & Auth) */
|
||||
std::string p3Peers::getOwnId()
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getOwnId()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mAuthMgr->OwnId();
|
||||
}
|
||||
|
||||
bool p3Peers::getOnlineList(std::list<std::string> &ids)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getOnlineList()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mConnectMgr */
|
||||
mConnMgr->getOnlineList(ids);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool p3Peers::getFriendList(std::list<std::string> &ids)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getFriendList()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mConnectMgr */
|
||||
mConnMgr->getFriendList(ids);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool p3Peers::getOthersList(std::list<std::string> &ids)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getOthersList()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mAuthMgr */
|
||||
mAuthMgr->getAllList(ids);
|
||||
return true;
|
||||
}
|
||||
|
||||
bool p3Peers::isFriend(std::string id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::isFriend() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mConnectMgr */
|
||||
peerConnectState state;
|
||||
if (mConnMgr->getFriendNetStatus(id, state) &&
|
||||
(state.state & RS_PEER_S_FRIEND))
|
||||
{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool p3Peers::getPeerDetails(std::string id, RsPeerDetails &d)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getPeerDetails() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mAuthMgr (first) */
|
||||
pqiAuthDetails authDetail;
|
||||
if (!mAuthMgr->getDetails(id, authDetail))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
d.id = authDetail.id;
|
||||
d.name = authDetail.name;
|
||||
d.email = authDetail.email;
|
||||
d.location = authDetail.location;
|
||||
d.org = authDetail.org;
|
||||
d.signers = authDetail.signers;
|
||||
|
||||
d.ownsign = authDetail.ownsign;
|
||||
d.trusted = authDetail.trusted;
|
||||
|
||||
d.trustLvl = RsPeerTranslateTrust(authDetail.trustLvl);
|
||||
|
||||
/* generate */
|
||||
d.authcode = "AUTHCODE";
|
||||
|
||||
/* get from mConnectMgr */
|
||||
peerConnectState pcs;
|
||||
|
||||
if (!mConnMgr->getFriendNetStatus(id, pcs))
|
||||
{
|
||||
if (!mConnMgr->getOthersNetStatus(id, pcs))
|
||||
{
|
||||
/* fill in blank data */
|
||||
d.localPort = 0;
|
||||
d.extPort = 0;
|
||||
d.lastConnect = 0;
|
||||
d.connectPeriod = 0;
|
||||
d.state = 0;
|
||||
d.netMode = 0;
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
/* fill from pcs */
|
||||
|
||||
d.localAddr = inet_ntoa(pcs.localaddr.sin_addr);
|
||||
d.localPort = ntohs(pcs.localaddr.sin_port);
|
||||
d.extAddr = inet_ntoa(pcs.serveraddr.sin_addr);
|
||||
d.extPort = ntohs(pcs.serveraddr.sin_port);
|
||||
d.lastConnect = 0;
|
||||
d.connectPeriod = 0;
|
||||
|
||||
/* Translate */
|
||||
|
||||
d.state = 0;
|
||||
if (pcs.state & RS_PEER_S_FRIEND)
|
||||
d.state |= RS_PEER_STATE_FRIEND;
|
||||
if (pcs.state & RS_PEER_S_ONLINE)
|
||||
d.state |= RS_PEER_STATE_ONLINE;
|
||||
if (pcs.state & RS_PEER_S_CONNECTED)
|
||||
d.state |= RS_PEER_STATE_CONNECTED;
|
||||
|
||||
d.netMode = 0;
|
||||
// TODO if (pcs.type & RS_NET_CONN_TCP_EXTERNAL)
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
std::string p3Peers::getPeerName(std::string id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::getPeerName() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
/* get from mAuthMgr as it should have more peers? */
|
||||
return mAuthMgr->getName(id);
|
||||
}
|
||||
|
||||
/* Add/Remove Friends */
|
||||
bool p3Peers::addFriend(std::string id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::addFriend() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mConnMgr->addFriend(id);
|
||||
}
|
||||
|
||||
bool p3Peers::removeFriend(std::string id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::removeFriend() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mConnMgr->removeFriend(id);
|
||||
}
|
||||
|
||||
/* Network Stuff */
|
||||
bool p3Peers::connectAttempt(std::string id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::connectAttempt() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mConnMgr->retryConnect(id);
|
||||
}
|
||||
|
||||
bool p3Peers::setLocalAddress(std::string id, std::string addr_str, uint16_t port)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::setLocalAddress() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
struct sockaddr_in addr;
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port);
|
||||
|
||||
int ret = 1;
|
||||
/********************************** WINDOWS/UNIX SPECIFIC PART *******************/
|
||||
#ifndef WINDOWS_SYS
|
||||
if (ret && (0 != inet_aton(addr_str.c_str(), &(addr.sin_addr))))
|
||||
#else
|
||||
addr.sin_addr.s_addr = inet_addr(addr_str.c_str());
|
||||
if (ret)
|
||||
#endif
|
||||
/********************************** WINDOWS/UNIX SPECIFIC PART *******************/
|
||||
{
|
||||
return mConnMgr->setLocalAddress(id, addr);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool p3Peers::setExtAddress(std::string id, std::string addr_str, uint16_t port)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::setExtAddress() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
struct sockaddr_in addr;
|
||||
addr.sin_family = AF_INET;
|
||||
addr.sin_port = htons(port);
|
||||
|
||||
int ret = 1;
|
||||
/********************************** WINDOWS/UNIX SPECIFIC PART *******************/
|
||||
#ifndef WINDOWS_SYS
|
||||
if (ret && (0 != inet_aton(addr_str.c_str(), &(addr.sin_addr))))
|
||||
#else
|
||||
addr.sin_addr.s_addr = inet_addr(addr_str.c_str());
|
||||
if (ret)
|
||||
#endif
|
||||
/********************************** WINDOWS/UNIX SPECIFIC PART *******************/
|
||||
{
|
||||
return mConnMgr->setExtAddress(id, addr);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
bool p3Peers::setNetworkMode(std::string id, uint32_t netMode)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::setNetworkMode() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mConnMgr->setNetworkMode(id, netMode);
|
||||
}
|
||||
|
||||
/* Auth Stuff */
|
||||
std::string p3Peers::GetRetroshareInvite()
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::GetRetroshareInvite()";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
std::string ownId = mAuthMgr->OwnId();
|
||||
std::string certstr = mAuthMgr->SaveCertificateToString(ownId);
|
||||
std::string name = mAuthMgr->getName(ownId);
|
||||
|
||||
std::ostringstream out;
|
||||
out << "You have been invited to join the retroshare";
|
||||
out << " community by: " << name;
|
||||
out << std::endl;
|
||||
out << std::endl;
|
||||
out << "Retroshare is a Friend-2-Friend network that enables you to";
|
||||
out << " communicate securely and";
|
||||
out << std::endl;
|
||||
out << "privately with your friends. ";
|
||||
out << "You can use it for chat, messages, ";
|
||||
out << "channels, and file-sharing. ";
|
||||
out << std::endl;
|
||||
out << std::endl;
|
||||
out << "Download it from: ";
|
||||
out << "http://retroshare.sf.net";
|
||||
out << std::endl;
|
||||
out << std::endl;
|
||||
out << "Thanks, ";
|
||||
out << " " << name << ", DrBob and the RetroShare Team!";
|
||||
out << std::endl;
|
||||
out << std::endl;
|
||||
out << certstr;
|
||||
out << std::endl;
|
||||
|
||||
return out.str();
|
||||
}
|
||||
|
||||
bool p3Peers::LoadCertificateFromFile(std::string fname, std::string &id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::LoadCertificateFromFile() ";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mAuthMgr->LoadCertificateFromFile(fname, id);
|
||||
}
|
||||
|
||||
bool p3Peers::LoadCertificateFromString(std::string cert, std::string &id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::LoadCertificateFromString() ";
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mAuthMgr->LoadCertificateFromString(cert, id);
|
||||
}
|
||||
|
||||
bool p3Peers::SaveCertificateToFile(std::string id, std::string fname)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::SaveCertificateToFile() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
ensureExtension(fname, "pqi");
|
||||
|
||||
return mAuthMgr->SaveCertificateToFile(id, fname);
|
||||
}
|
||||
|
||||
std::string p3Peers::SaveCertificateToString(std::string id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::SaveCertificateToString() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mAuthMgr->SaveCertificateToString(id);
|
||||
}
|
||||
|
||||
bool p3Peers::AuthCertificate(std::string id, std::string code)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::AuthCertificate() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
if (mAuthMgr->AuthCertificate(id))
|
||||
{
|
||||
/* add in as a friend */
|
||||
return mConnMgr->addFriend(id);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool p3Peers::SignCertificate(std::string id)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::SignCertificate() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mAuthMgr->SignCertificate(id);
|
||||
}
|
||||
|
||||
bool p3Peers::TrustCertificate(std::string id, bool trust)
|
||||
{
|
||||
#ifdef P3PEERS_DEBUG
|
||||
std::cerr << "p3Peers::TrustCertificate() " << id;
|
||||
std::cerr << std::endl;
|
||||
#endif
|
||||
|
||||
return mAuthMgr->TrustCertificate(id, trust);
|
||||
}
|
||||
|
||||
|
||||
|
||||
int ensureExtension(std::string &name, std::string def_ext)
|
||||
{
|
||||
/* if it has an extension, don't change */
|
||||
int len = name.length();
|
||||
int extpos = name.find_last_of('.');
|
||||
|
||||
std::ostringstream out;
|
||||
out << "ensureExtension() name: " << name << std::endl;
|
||||
out << "\t\t extpos: " << extpos;
|
||||
out << " len: " << len << std::endl;
|
||||
|
||||
/* check that the '.' has between 1 and 4 char after it (an extension) */
|
||||
if ((extpos > 0) && (extpos < len - 1) && (extpos + 6 > len))
|
||||
{
|
||||
/* extension there */
|
||||
std::string curext = name.substr(extpos, len);
|
||||
out << "ensureExtension() curext: " << curext << std::endl;
|
||||
std::cerr << out.str();
|
||||
return 0;
|
||||
}
|
||||
|
||||
if (extpos != len - 1)
|
||||
{
|
||||
name += ".";
|
||||
}
|
||||
name += def_ext;
|
||||
|
||||
out << "ensureExtension() added ext: " << name << std::endl;
|
||||
|
||||
std::cerr << out.str();
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
RsPeerDetails::RsPeerDetails()
|
||||
:trustLvl(0), ownsign(false), trusted(false), state(0), netMode(0),
|
||||
lastConnect(0), connectPeriod(0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
std::ostream &operator<<(std::ostream &out, const RsPeerDetails &detail)
|
||||
{
|
||||
out << "RsPeerDetail: " << detail.name << " <" << detail.id << ">";
|
||||
out << std::endl;
|
||||
|
||||
out << " email: " << detail.email;
|
||||
out << " location:" << detail.location;
|
||||
out << " org: " << detail.org;
|
||||
out << std::endl;
|
||||
|
||||
out << " fpr: " << detail.fpr;
|
||||
out << " authcode:" << detail.authcode;
|
||||
out << std::endl;
|
||||
|
||||
out << " signers:";
|
||||
out << std::endl;
|
||||
|
||||
std::list<std::string>::const_iterator it;
|
||||
for(it = detail.signers.begin();
|
||||
it != detail.signers.end(); it++)
|
||||
{
|
||||
out << "\t" << *it;
|
||||
out << std::endl;
|
||||
}
|
||||
out << std::endl;
|
||||
|
||||
out << " trustLvl: " << detail.trustLvl;
|
||||
out << " ownSign: " << detail.ownsign;
|
||||
out << " trusted: " << detail.trusted;
|
||||
out << std::endl;
|
||||
|
||||
out << " state: " << detail.state;
|
||||
out << " netMode: " << detail.netMode;
|
||||
out << std::endl;
|
||||
|
||||
out << " localAddr: " << detail.localAddr;
|
||||
out << ":" << detail.localPort;
|
||||
out << std::endl;
|
||||
out << " extAddr: " << detail.extAddr;
|
||||
out << ":" << detail.extPort;
|
||||
out << std::endl;
|
||||
|
||||
|
||||
out << " lastConnect: " << detail.lastConnect;
|
||||
out << " connectPeriod: " << detail.connectPeriod;
|
||||
out << std::endl;
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
|
||||
/********** TRANSLATION ****/
|
||||
|
||||
/**************** PQI_USE_XPGP ******************/
|
||||
#if defined(PQI_USE_XPGP)
|
||||
#include "pqi/authxpgp.h"
|
||||
#else /* X509 Certificates */
|
||||
/**************** PQI_USE_XPGP ******************/
|
||||
|
||||
#endif /* X509 Certificates */
|
||||
/**************** PQI_USE_XPGP ******************/
|
||||
|
||||
uint32_t RsPeerTranslateTrust(uint32_t trustLvl)
|
||||
{
|
||||
switch(trustLvl)
|
||||
{
|
||||
case TRUST_SIGN_OWN:
|
||||
case TRUST_SIGN_TRSTED:
|
||||
case TRUST_SIGN_AUTHEN:
|
||||
return RS_TRUST_LVL_GOOD;
|
||||
break;
|
||||
|
||||
case TRUST_SIGN_BASIC:
|
||||
return RS_TRUST_LVL_MARGINAL;
|
||||
break;
|
||||
|
||||
case TRUST_SIGN_UNTRUSTED:
|
||||
case TRUST_SIGN_UNKNOWN:
|
||||
case TRUST_SIGN_NONE:
|
||||
default:
|
||||
return RS_TRUST_LVL_UNKNOWN;
|
||||
break;
|
||||
}
|
||||
return RS_TRUST_LVL_UNKNOWN;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue