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

Merge pull request #167 from G10h4ck/pqicleaning

Browse source 
Removed some cruft like mymethod(){return;} from pqi
This commit is contained in:
Cyril Soler 2015-11-26 14:48:30 -05:00
commit 874f304cd2
8 changed files with 168 additions and 218 deletions
Download patch file Download diff file Expand all files Collapse all files

141
libretroshare/src/pqi/pqi_base.h
View file

@ -225,18 +225,14 @@ class PQInterface: public RateInterface
/** /**
* also there are tick + person id functions. * also there are tick + person id functions.
*/ */
virtual int tick() { return 0; } virtual int tick() { return 0; }
virtual int status() { return 0; } virtual int status() { return 0; }
virtual const RsPeerId& PeerId() { return peerId; } virtual const RsPeerId& PeerId() { return peerId; }
// the callback from NetInterface Connection Events. // the callback from NetInterface Connection Events.
virtual int notifyEvent(NetInterface *ni, int event, const struct sockaddr_storage &remote_peer_address) virtual int notifyEvent(NetInterface * /*ni*/, int /*event*/,
{ const sockaddr_storage & /*remote_peer_address*/)
(void) ni; /* remove unused parameter warnings */ { return 0; }
(void) event; /* remove unused parameter warnings */
(void) remote_peer_address;
return 0;
}
private: private:
@ -267,57 +263,57 @@ const uint32_t PQI_CONNECT_HIDDEN_I2P_TCP = 0x0008;
class BinInterface class BinInterface
{ {
public: public:
BinInterface() { return; } BinInterface() {}
virtual ~BinInterface() { return; } virtual ~BinInterface() {}
/** /**
* To be called loop, for updating state * To be called loop, for updating state
*/ */
virtual int tick() = 0; virtual int tick() = 0;
/** /**
* Sends data to a prescribed location (implementation dependent) * Sends data to a prescribed location (implementation dependent)
*@param data what will be sent *@param data what will be sent
*@param len the size of data pointed to in memory *@param len the size of data pointed to in memory
*/ */
virtual int senddata(void *data, int len) = 0; virtual int senddata(void *data, int len) = 0;
/** /**
* reads data from a prescribed location (implementation dependent) * reads data from a prescribed location (implementation dependent)
*@param data what will be sent *@param data what will be sent
*@param len the size of data pointed to in memory *@param len the size of data pointed to in memory
*/ */
virtual int readdata(void *data, int len) = 0; virtual int readdata(void *data, int len) = 0;
/** /**
* Is more particular the case of the sending data through a socket (internet) * Is more particular the case of the sending data through a socket (internet)
* moretoread and candsend, take a microsec timeout argument. * moretoread and candsend, take a microsec timeout argument.
* *
*/ */
virtual int netstatus() = 0; virtual int netstatus() = 0;
virtual int isactive() = 0; virtual int isactive() = 0;
virtual bool moretoread(uint32_t usec) = 0; virtual bool moretoread(uint32_t usec) = 0;
virtual bool cansend(uint32_t usec) = 0; virtual bool cansend(uint32_t usec) = 0;
/** /**
* method for streamer to shutdown bininterface * method for streamer to shutdown bininterface
**/ **/
virtual int close() = 0; virtual int close() = 0;
/** /**
* If hashing data * If hashing data
**/ **/
virtual RsFileHash gethash() = 0; virtual RsFileHash gethash() = 0;
/** /**
* Number of bytes read/sent * Number of bytes read/sent
*/ */
virtual uint64_t bytecount() { return 0; } virtual uint64_t bytecount() { return 0; }
/** /**
* used by pqistreamer to limit transfers * used by pqistreamer to limit transfers
**/ **/
virtual bool bandwidthLimited() { return true; } virtual bool bandwidthLimited() { return true; }
}; };
@ -360,26 +356,30 @@ public:
/** /**
* @param p_in used to notify system of connect/disconnect events * @param p_in used to notify system of connect/disconnect events
*/ */
NetInterface(PQInterface *p_in, const RsPeerId& id) NetInterface(PQInterface *p_in, const RsPeerId& id) : p(p_in), peerId(id) {}
:p(p_in), peerId(id) { return; }
virtual ~NetInterface() virtual ~NetInterface() {}
{ return; }
virtual int connect(const struct sockaddr_storage &raddr) = 0; /* TODO
virtual int listen() = 0; * The data entrypoint is connect(const struct sockaddr_storage &raddr)
virtual int stoplistening() = 0; * To generalize NetInterface we should have a more general type for raddr
virtual int disconnect() = 0; * As an example a string containing an url or encoded like a domain name
virtual int reset() = 0; */
virtual const RsPeerId& PeerId() { return peerId; } virtual int connect(const struct sockaddr_storage &raddr) = 0;
virtual int getConnectAddress(struct sockaddr_storage &raddr) = 0;
virtual bool connect_parameter(uint32_t type, uint32_t value) = 0; virtual int listen() = 0;
virtual bool connect_parameter(uint32_t /* type */ , const std::string & /* value */ ) { return false; } // not generally used. virtual int stoplistening() = 0;
virtual bool connect_additional_address(uint32_t /*type*/, const struct sockaddr_storage & /*addr*/) { return false; } // only needed by udp. virtual int disconnect() = 0;
virtual int reset() = 0;
virtual const RsPeerId& PeerId() { return peerId; }
virtual int getConnectAddress(struct sockaddr_storage &raddr) = 0;
virtual bool connect_parameter(uint32_t type, uint32_t value) = 0;
virtual bool connect_parameter(uint32_t /* type */ , const std::string & /* value */ ) { return false; } // not generally used.
virtual bool connect_additional_address(uint32_t /*type*/, const struct sockaddr_storage & /*addr*/) { return false; } // only needed by udp.
protected: protected:
PQInterface *parent() { return p; } PQInterface *parent() { return p; }
private: private:
PQInterface *p; PQInterface *p;
@ -397,10 +397,9 @@ private:
class NetBinInterface: public NetInterface, public BinInterface class NetBinInterface: public NetInterface, public BinInterface
{ {
public: public:
NetBinInterface(PQInterface *parent, const RsPeerId& id) NetBinInterface(PQInterface *parent, const RsPeerId& id) :
:NetInterface(parent, id) NetInterface(parent, id) {}
{ return; } virtual ~NetBinInterface() {}
virtual ~NetBinInterface() { return; }
}; };
#define CHAN_SIGN_SIZE 16 #define CHAN_SIGN_SIZE 16

23
libretroshare/src/pqi/pqilistener.h
View file

@ -31,21 +31,14 @@
class pqilistener class pqilistener
{ {
public: public:
pqilistener() {}
pqilistener() { return; } virtual ~pqilistener() {}
virtual ~pqilistener() { return; } virtual int tick() { return 1; }
virtual int status() { return 1; }
virtual int tick() { return 1; } virtual int setListenAddr(const sockaddr_storage & /*addr*/) { return 1; }
virtual int status() { return 1; } virtual int setuplisten() { return 1; }
virtual int setListenAddr(const struct sockaddr_storage &addr) virtual int resetlisten() { return 1; }
{
(void) addr; /* suppress unused parameter warning */
return 1;
}
virtual int setuplisten() { return 1; }
virtual int resetlisten() { return 1; }
}; };

5
libretroshare/src/pqi/pqissl.cc
View file

@ -1936,10 +1936,7 @@ bool pqissl::cansend(uint32_t usec)
} }
RsFileHash pqissl::gethash() RsFileHash pqissl::gethash() { return RsFileHash(); }
{
return RsFileHash() ;
}
/********** End of Implementation of BinInterface ******************/ /********** End of Implementation of BinInterface ******************/

15
libretroshare/src/pqi/pqissl.h
View file

@ -170,10 +170,13 @@ int Extract_Failed_SSL_Certificate(); // try to get cert anyway.
bool CheckConnectionTimeout(); bool CheckConnectionTimeout();
//protected internal fns that are overloaded for udp case. /* Do we really need this ?
virtual int net_internal_close(int fd); * It is very specific TCP+SSL stuff and unlikely to be reused.
virtual int net_internal_SSL_set_fd(SSL *ssl, int fd); * In fact we are overloading them in pqissludp case where they do different things or nothing.
virtual int net_internal_fcntl_nonblock(int fd); */
virtual int net_internal_close(int fd);
virtual int net_internal_SSL_set_fd(SSL *ssl, int fd);
virtual int net_internal_fcntl_nonblock(int fd);
/* data */ /* data */
@ -206,11 +209,9 @@ virtual int net_internal_fcntl_nonblock(int fd);
uint32_t mConnectTimeout; uint32_t mConnectTimeout;
time_t mTimeoutTS; time_t mTimeoutTS;
private: private:
// ssl only fns. // ssl only fns.
int connectInterface(const struct sockaddr_storage &addr); int connectInterface(const struct sockaddr_storage &addr);
}; };

30
libretroshare/src/pqi/pqissllistener.cc
View file

@ -56,19 +56,17 @@ const int pqissllistenzone = 49787;
*/ */
pqissllistenbase::pqissllistenbase(const struct sockaddr_storage &addr, p3PeerMgr *pm) pqissllistenbase::pqissllistenbase(const sockaddr_storage &addr, p3PeerMgr *pm)
:laddr(addr), active(false), mPeerMgr(pm) : laddr(addr), active(false), mPeerMgr(pm)
{ {
if (!(AuthSSL::getAuthSSL()-> active())) { if (!(AuthSSL::getAuthSSL()-> active()))
pqioutput(PQL_ALERT, pqissllistenzone, {
"SSL-CTX-CERT-ROOT not initialised!"); pqioutput(PQL_ALERT, pqissllistenzone,
"SSL-CTX-CERT-ROOT not initialised!");
exit(1); exit(1);
} }
setuplisten(); setuplisten();
return;
} }
pqissllistenbase::~pqissllistenbase() pqissllistenbase::~pqissllistenbase()
@ -730,18 +728,7 @@ int pqissllistenbase::isSSLActive(int /*fd*/, SSL *ssl)
* *
*/ */
pqissllistener::pqissllistener(const struct sockaddr_storage &addr, p3PeerMgr *lm) int pqissllistener::addlistenaddr(const RsPeerId& id, pqissl *acc)
:pqissllistenbase(addr, lm)
{
return;
}
pqissllistener::~pqissllistener()
{
return;
}
int pqissllistener::addlistenaddr(const RsPeerId& id, pqissl *acc)
{ {
std::map<RsPeerId, pqissl *>::iterator it; std::map<RsPeerId, pqissl *>::iterator it;
@ -755,7 +742,6 @@ int pqissllistener::addlistenaddr(const RsPeerId& id, pqissl *acc)
pqioutput(PQL_DEBUG_ALERT, pqissllistenzone, out); pqioutput(PQL_DEBUG_ALERT, pqissllistenzone, out);
return -1; return -1;
} }
} }
@ -792,7 +778,7 @@ int pqissllistener::removeListenPort(const RsPeerId& id)
} }
int pqissllistener::status() int pqissllistener::status()
{ {
pqissllistenbase::status(); pqissllistenbase::status();
// print certificates we are listening for. // print certificates we are listening for.

95
libretroshare/src/pqi/pqissllistener.h
View file

@ -49,13 +49,12 @@ class p3PeerMgr;
class AcceptedSSL class AcceptedSSL
{ {
public: public:
int mFd; int mFd;
SSL *mSSL; SSL *mSSL;
RsPeerId mPeerId; RsPeerId mPeerId;
struct sockaddr_storage mAddr; sockaddr_storage mAddr;
time_t mAcceptTS; time_t mAcceptTS;
}; };
@ -64,26 +63,22 @@ class AcceptedSSL
class pqissllistenbase: public pqilistener class pqissllistenbase: public pqilistener
{ {
public: public:
pqissllistenbase(const struct sockaddr_storage &addr, p3PeerMgr *pm);
virtual ~pqissllistenbase();
/*************************************/
/* LISTENER INTERFACE */
virtual int tick();
virtual int status();
virtual int setListenAddr(const struct sockaddr_storage &addr);
virtual int setuplisten();
virtual int resetlisten();
/*************************************/
pqissllistenbase(const struct sockaddr_storage &addr, p3PeerMgr *pm); int acceptconnection();
virtual ~pqissllistenbase(); int continueaccepts();
int finaliseAccepts();
/*************************************/
/* LISTENER INTERFACE **/
virtual int tick();
virtual int status();
virtual int setListenAddr(const struct sockaddr_storage &addr);
virtual int setuplisten();
virtual int resetlisten();
/*************************************/
int acceptconnection();
int continueaccepts();
int finaliseAccepts();
struct IncomingSSLInfo struct IncomingSSLInfo
{ {
@ -95,52 +90,44 @@ int finaliseAccepts();
}; };
// fn to get cert, anyway // fn to get cert, anyway
int continueSSL(IncomingSSLInfo&, bool); int continueSSL(IncomingSSLInfo&, bool);
int closeConnection(int fd, SSL *ssl); int closeConnection(int fd, SSL *ssl);
int isSSLActive(int fd, SSL *ssl); int isSSLActive(int fd, SSL *ssl);
virtual int completeConnection(int sockfd, IncomingSSLInfo&) = 0; virtual int completeConnection(int sockfd, IncomingSSLInfo&) = 0;
virtual int finaliseConnection(int fd, SSL *ssl, const RsPeerId& peerId, const struct sockaddr_storage &raddr) = 0; virtual int finaliseConnection(int fd, SSL *ssl, const RsPeerId& peerId,
protected: const sockaddr_storage &raddr) = 0;
protected:
struct sockaddr_storage laddr; struct sockaddr_storage laddr;
std::list<AcceptedSSL> accepted_ssl; std::list<AcceptedSSL> accepted_ssl;
private:
int Extract_Failed_SSL_Certificate(const IncomingSSLInfo&);
bool active;
int lsock;
std::list<IncomingSSLInfo> incoming_ssl ;
protected:
p3PeerMgr *mPeerMgr; p3PeerMgr *mPeerMgr;
private:
int Extract_Failed_SSL_Certificate(const IncomingSSLInfo&);
bool active;
int lsock;
std::list<IncomingSSLInfo> incoming_ssl ;
}; };
class pqissllistener: public pqissllistenbase class pqissllistener: public pqissllistenbase
{ {
public: public:
pqissllistener(const struct sockaddr_storage &addr, p3PeerMgr *pm) :
pqissllistenbase(addr, pm) {}
virtual ~pqissllistener() {}
pqissllistener(const struct sockaddr_storage &addr, p3PeerMgr *pm); int addlistenaddr(const RsPeerId& id, pqissl *acc);
virtual ~pqissllistener(); int removeListenPort(const RsPeerId& id);
int addlistenaddr(const RsPeerId& id, pqissl *acc); virtual int status();
int removeListenPort(const RsPeerId& id); virtual int completeConnection(int sockfd, IncomingSSLInfo&);
virtual int finaliseConnection(int fd, SSL *ssl, const RsPeerId& peerId,
const sockaddr_storage &raddr);
//virtual int tick(); private:
virtual int status(); std::map<RsPeerId, pqissl*> listenaddr;
virtual int completeConnection(int sockfd, IncomingSSLInfo&);
virtual int finaliseConnection(int fd, SSL *ssl, const RsPeerId& peerId, const struct sockaddr_storage &raddr);
private:
std::map<RsPeerId, pqissl *> listenaddr;
}; };

34
libretroshare/src/pqi/pqissludp.cc
View file

@ -51,22 +51,22 @@ static const uint32_t PQI_SSLUDP_DEF_CONN_PERIOD = 300; /* 5 minutes? */
/********** PQI SSL UDP STUFF **************************************/ /********** PQI SSL UDP STUFF **************************************/
pqissludp::pqissludp(PQInterface *parent, p3LinkMgr *lm) pqissludp::pqissludp(PQInterface *parent, p3LinkMgr *lm) :
:pqissl(NULL, parent, lm), tou_bio(NULL), pqissl(NULL, parent, lm), tou_bio(NULL), listen_checktime(0),
listen_checktime(0), mConnectPeriod(PQI_SSLUDP_DEF_CONN_PERIOD), mConnectFlags(0), mConnectBandwidth(0) mConnectPeriod(PQI_SSLUDP_DEF_CONN_PERIOD), mConnectFlags(0),
mConnectBandwidth(0)
{ {
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/ RS_STACK_MUTEX(mSslMtx);
sockaddr_storage_clear(remote_addr); sockaddr_storage_clear(remote_addr);
sockaddr_storage_clear(mConnectProxyAddr); sockaddr_storage_clear(mConnectProxyAddr);
sockaddr_storage_clear(mConnectSrcAddr); sockaddr_storage_clear(mConnectSrcAddr);
return;
} }
pqissludp::~pqissludp() pqissludp::~pqissludp()
{ {
rslog(RSL_ALERT, pqissludpzone, rslog(RSL_ALERT, pqissludpzone,
"pqissludp::~pqissludp -> destroying pqissludp"); "pqissludp::~pqissludp -> destroying pqissludp");
/* must call reset from here, so that the /* must call reset from here, so that the
@ -76,16 +76,13 @@ pqissludp::~pqissludp()
* This means that reset() will be called twice, but this should * This means that reset() will be called twice, but this should
* be harmless. * be harmless.
*/ */
stoplistening(); /* remove from p3proxy listenqueue */ stoplistening(); /* remove from p3proxy listenqueue */
reset(); reset();
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/ RS_STACK_MUTEX(mSslMtx);
if (tou_bio) // this should be in the reset? if (tou_bio) // this should be in the reset?
{
BIO_free(tou_bio); BIO_free(tou_bio);
}
return;
} }
int pqissludp::reset_locked() int pqissludp::reset_locked()
@ -153,7 +150,7 @@ int pqissludp::attach()
// The Address determination is done centrally // The Address determination is done centrally
int pqissludp::Initiate_Connection() int pqissludp::Initiate_Connection()
{ {
int err; int err;
@ -349,7 +346,7 @@ int pqissludp::Initiate_Connection()
} }
/********* VERY DIFFERENT **********/ /********* VERY DIFFERENT **********/
int pqissludp::Basic_Connection_Complete() int pqissludp::Basic_Connection_Complete()
{ {
rslog(RSL_DEBUG_BASIC, pqissludpzone, rslog(RSL_DEBUG_BASIC, pqissludpzone,
"pqissludp::Basic_Connection_Complete()..."); "pqissludp::Basic_Connection_Complete()...");
@ -449,15 +446,6 @@ int pqissludp::net_internal_fcntl_nonblock(int /*fd*/)
} }
/* These are identical to pqinetssl version */
//int pqissludp::status()
int pqissludp::tick()
{
pqissl::tick();
return 1;
}
// listen fns call the udpproxy. // listen fns call the udpproxy.
int pqissludp::listen() int pqissludp::listen()
{ {

43
libretroshare/src/pqi/pqissludp.h
View file

@ -45,7 +45,7 @@
class pqissludp; class pqissludp;
class cert; class cert;
/* This provides a NetBinInterface, which is /* This provides a NetBinInterface, which is
* primarily inherited from pqissl. * primarily inherited from pqissl.
* fns declared here are different -> all others are identical. * fns declared here are different -> all others are identical.
*/ */
@ -53,49 +53,48 @@ class cert;
class pqissludp: public pqissl class pqissludp: public pqissl
{ {
public: public:
pqissludp(PQInterface *parent, p3LinkMgr *lm); pqissludp(PQInterface *parent, p3LinkMgr *lm);
virtual ~pqissludp(); virtual ~pqissludp();
// NetInterface. // NetInterface.
// listen fns call the udpproxy. // listen fns call the udpproxy.
virtual int listen(); virtual int listen();
virtual int stoplistening(); virtual int stoplistening();
virtual int tick();
virtual bool connect_parameter(uint32_t type, uint32_t value); virtual bool connect_parameter(uint32_t type, uint32_t value);
virtual bool connect_additional_address(uint32_t type, const struct sockaddr_storage &addr); virtual bool connect_additional_address(uint32_t type, const struct sockaddr_storage &addr);
// BinInterface. // BinInterface.
// These are reimplemented. // These are reimplemented.
virtual bool moretoread(uint32_t usec); virtual bool moretoread(uint32_t usec);
virtual bool cansend(uint32_t usec); virtual bool cansend(uint32_t usec);
/* UDP always through firewalls -> always bandwidth Limited */ /* UDP always through firewalls -> always bandwidth Limited */
virtual bool bandwidthLimited() { return true; } virtual bool bandwidthLimited() { return true; }
protected: protected:
// pqissludp specific. // pqissludp specific.
// called to initiate a connection; // called to initiate a connection;
int attach(); int attach();
virtual int reset_locked(); virtual int reset_locked();
virtual int Initiate_Connection(); virtual int Initiate_Connection();
virtual int Basic_Connection_Complete(); virtual int Basic_Connection_Complete();
//protected internal fns that are overloaded for udp case. /* Do we really need this ?
virtual int net_internal_close(int fd); * It is very specific UDP+ToU+SSL stuff and unlikely to be reused.
virtual int net_internal_SSL_set_fd(SSL *ssl, int fd); * In fact we are overloading them here becase they are very do different of pqissl.
virtual int net_internal_fcntl_nonblock(int fd); */
virtual int net_internal_close(int fd);
virtual int net_internal_SSL_set_fd(SSL *ssl, int fd);
virtual int net_internal_fcntl_nonblock(int fd);
private: private:
BIO *tou_bio; // specific to ssludp. BIO *tou_bio; // specific to ssludp.
//int remote_timeout;
//int proxy_timeout;
long listen_checktime; long listen_checktime;
uint32_t mConnectPeriod; uint32_t mConnectPeriod;