mirror of
https://github.com/RetroShare/RetroShare.git
synced 2024-10-01 02:35:48 -04:00
8e3e7d5209
the periodical call of cleanupUsedLocation, which was reloading all the GPG Keys - for each cleanup Key. This required cleaning up various bits (AuthGPG, rsPeers, p3Disc). * moved rsPeer::cleanUnusedLocations => p3PeerMgr::removeUnusedLocations(); - made the function light-weight, no loading of GPG Keys. * moved getSSLCertsFromGPG() fn from rsPeers => p3PeerMgr * added p3PeerMgr::removeAllFriendLocations() to cleanup when removing a GPG Friend. * cleaned up rsPeers, made addFriend() / removeFriend() universal functions. * remove bool p3Peers::setAcceptToConnectGPGCertificate(const std::string &gpg_id, bool acceptance) * removed all Dummy SSL Ids. - There is no need for this! * Major changes to p3disc to correct FLAWED logic. (needs more testing). * removed as many dependancies on retroshare/rspeer.h as possible. * changed p3turtle dependancy on rsPeers ==> mLinkMgr. * added p3LinkMgr::getPeerName() and p3PeerMgr::getPeerName() * added return 1 to pqissllistener::closeConnection(). * removed unused code from AuthGPG(). * removed storeAllKeys() calls in AuthGPG::AllowConnection(). git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4542 b45a01b8-16f6-495d-af2f-9b41ad6348cc
177 lines
4.7 KiB
C++
177 lines
4.7 KiB
C++
/*
|
|
* libretroshare/src/services: p3disc.h
|
|
*
|
|
* Services for RetroShare.
|
|
*
|
|
* 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".
|
|
*
|
|
*/
|
|
|
|
#ifndef MRK_PQI_AUTODISC_H
|
|
#define MRK_PQI_AUTODISC_H
|
|
|
|
// The AutoDiscovery Class
|
|
|
|
#include <string>
|
|
#include <list>
|
|
|
|
// system specific network headers
|
|
#include "pqi/pqinetwork.h"
|
|
|
|
#include "pqi/pqi.h"
|
|
#include "pqi/pqipersongrp.h"
|
|
|
|
class p3ConnectMgr;
|
|
|
|
#include "pqi/pqimonitor.h"
|
|
#include "serialiser/rsdiscitems.h"
|
|
#include "services/p3service.h"
|
|
#include "pqi/authgpg.h"
|
|
|
|
class autoserver
|
|
{
|
|
public:
|
|
autoserver()
|
|
:ts(0), discFlags(0) { return;}
|
|
|
|
std::string id;
|
|
struct sockaddr_in localAddr;
|
|
struct sockaddr_in remoteAddr;
|
|
|
|
time_t ts;
|
|
uint32_t discFlags;
|
|
};
|
|
|
|
|
|
class autoneighbour: public autoserver
|
|
{
|
|
public:
|
|
autoneighbour()
|
|
:autoserver(), authoritative(false) {}
|
|
|
|
bool authoritative;
|
|
bool validAddrs;
|
|
|
|
std::map<std::string, autoserver> neighbour_of;
|
|
|
|
};
|
|
|
|
class p3PeerMgr;
|
|
class p3LinkMgr;
|
|
|
|
|
|
class p3disc: public p3Service, public pqiMonitor, public p3Config, public AuthGPGService
|
|
{
|
|
public:
|
|
|
|
|
|
p3disc(p3PeerMgr *pm, p3LinkMgr *lm, pqipersongrp *persGrp);
|
|
|
|
/************* from pqiMonitor *******************/
|
|
virtual void statusChange(const std::list<pqipeer> &plist);
|
|
/************* from pqiMonitor *******************/
|
|
|
|
int tick();
|
|
|
|
/* GUI requires access */
|
|
bool potentialGPGproxies(const std::string& id, std::list<std::string> &proxyGPGIds);
|
|
bool potentialproxies(const std::string& id, std::list<std::string> &proxyIds);
|
|
void getversions(std::map<std::string, std::string> &versions);
|
|
void getWaitingDiscCount(unsigned int *sendCount, unsigned int *recvCount);
|
|
|
|
/************* from AuthGPService ****************/
|
|
virtual AuthGPGOperation *getGPGOperation();
|
|
virtual void setGPGOperation(AuthGPGOperation *operation);
|
|
|
|
protected:
|
|
/*****************************************************************/
|
|
/*********************** p3config ******************************/
|
|
/* Key Functions to be overloaded for Full Configuration */
|
|
virtual RsSerialiser *setupSerialiser();
|
|
virtual bool saveList(bool &cleanup, std::list<RsItem *>&);
|
|
virtual bool loadList(std::list<RsItem *>& load);
|
|
/*****************************************************************/
|
|
|
|
private:
|
|
|
|
|
|
void sendAllInfoToJustConnectedPeer(const std::string &id);
|
|
void sendJustConnectedPeerInfoToAllPeer(const std::string &id);
|
|
|
|
/* Network Output */
|
|
//void sendOwnDetails(std::string to);
|
|
void sendOwnVersion(std::string to);
|
|
RsDiscReply *createDiscReply(const std::string &to, const std::string &about);
|
|
//void sendPeerIssuer(std::string to, std::string about);
|
|
void sendHeartbeat(std::string to);
|
|
void askInfoToAllPeers(std::string about);
|
|
|
|
/* Network Input */
|
|
int handleIncoming();
|
|
void recvAskInfo(RsDiscAskInfo *item);
|
|
void recvPeerDetails(RsDiscReply *item, const std::string &certGpgId);
|
|
//void recvPeerIssuerMsg(RsDiscIssuer *item);
|
|
void recvPeerVersionMsg(RsDiscVersion *item);
|
|
void recvHeartbeatMsg(RsDiscHeartbeat *item);
|
|
void recvDiscReply(RsDiscReply *dri);
|
|
|
|
void removeFriend(std::string ssl_id); //keep tracks of removed friend so we're not gonna add them again immediately
|
|
|
|
/* handle network shape */
|
|
int addDiscoveryData(const std::string& fromId, const std::string& aboutId,
|
|
const std::string& fromGPGId,const std::string& aboutGPGId,
|
|
const struct sockaddr_in& laddr, const struct sockaddr_in& raddr,
|
|
uint32_t flags, time_t ts,bool& new_info);
|
|
|
|
int idServers();
|
|
|
|
private:
|
|
|
|
p3PeerMgr *mPeerMgr;
|
|
p3LinkMgr *mLinkMgr;
|
|
|
|
pqipersongrp *mPqiPersonGrp;
|
|
|
|
/* data */
|
|
RsMutex mDiscMtx;
|
|
|
|
time_t mLastSentHeartbeatTime;
|
|
bool mDiscEnabled;
|
|
|
|
//std::map<std::string, time_t> deletedSSLFriendsIds;
|
|
|
|
|
|
std::map<std::string, std::list<std::string> > mSendIdList;
|
|
std::list<RsDiscReply*> mPendingDiscReplyInList;
|
|
|
|
// Neighbors at the gpg level.
|
|
std::map<std::string,std::set<std::string> > gpg_neighbors ;
|
|
|
|
// Original mapping.
|
|
std::map<std::string, autoneighbour> neighbours;
|
|
|
|
// Rs Version.
|
|
std::map<std::string, std::string> versions;
|
|
};
|
|
|
|
|
|
|
|
|
|
#endif // MRK_PQI_AUTODISC_H
|