From 30e40470e26d554e71454d85c550e526f16266d8 Mon Sep 17 00:00:00 2001 From: Gio Date: Fri, 30 Oct 2015 09:23:59 +0100 Subject: [PATCH] Removed some cruft like mymethod(){return;} from pqi --- libretroshare/src/pqi/pqi_base.h | 127 +++++++++++++------------ libretroshare/src/pqi/pqilistener.h | 23 ++--- libretroshare/src/pqi/pqissl.cc | 5 +- libretroshare/src/pqi/pqissl.h | 15 +-- libretroshare/src/pqi/pqissllistener.h | 15 ++- libretroshare/src/pqi/pqissludp.cc | 34 +++---- libretroshare/src/pqi/pqissludp.h | 43 ++++----- 7 files changed, 120 insertions(+), 142 deletions(-) diff --git a/libretroshare/src/pqi/pqi_base.h b/libretroshare/src/pqi/pqi_base.h index d6128b579..97a29af24 100644 --- a/libretroshare/src/pqi/pqi_base.h +++ b/libretroshare/src/pqi/pqi_base.h @@ -267,57 +267,57 @@ const uint32_t PQI_CONNECT_HIDDEN_I2P_TCP = 0x0008; class BinInterface { public: - BinInterface() { return; } -virtual ~BinInterface() { return; } + BinInterface() {} + virtual ~BinInterface() {} -/** - * To be called loop, for updating state - */ -virtual int tick() = 0; + /** + * To be called loop, for updating state + */ + virtual int tick() = 0; -/** - * Sends data to a prescribed location (implementation dependent) - *@param data what will be sent - *@param len the size of data pointed to in memory - */ -virtual int senddata(void *data, int len) = 0; + /** + * Sends data to a prescribed location (implementation dependent) + *@param data what will be sent + *@param len the size of data pointed to in memory + */ + virtual int senddata(void *data, int len) = 0; -/** - * reads data from a prescribed location (implementation dependent) - *@param data what will be sent - *@param len the size of data pointed to in memory - */ -virtual int readdata(void *data, int len) = 0; + /** + * reads data from a prescribed location (implementation dependent) + *@param data what will be sent + *@param len the size of data pointed to in memory + */ + virtual int readdata(void *data, int len) = 0; -/** - * Is more particular the case of the sending data through a socket (internet) - * moretoread and candsend, take a microsec timeout argument. - * - */ -virtual int netstatus() = 0; -virtual int isactive() = 0; -virtual bool moretoread(uint32_t usec) = 0; -virtual bool cansend(uint32_t usec) = 0; + /** + * Is more particular the case of the sending data through a socket (internet) + * moretoread and candsend, take a microsec timeout argument. + * + */ + virtual int netstatus() = 0; + virtual int isactive() = 0; + virtual bool moretoread(uint32_t usec) = 0; + virtual bool cansend(uint32_t usec) = 0; -/** - * method for streamer to shutdown bininterface - **/ -virtual int close() = 0; + /** + * method for streamer to shutdown bininterface + **/ + virtual int close() = 0; -/** - * If hashing data - **/ -virtual RsFileHash gethash() = 0; + /** + * If hashing data + **/ + virtual RsFileHash gethash() = 0; -/** - * Number of bytes read/sent - */ -virtual uint64_t bytecount() { return 0; } + /** + * Number of bytes read/sent + */ + virtual uint64_t bytecount() { return 0; } -/** - * used by pqistreamer to limit transfers - **/ -virtual bool bandwidthLimited() { return true; } + /** + * used by pqistreamer to limit transfers + **/ + virtual bool bandwidthLimited() { return true; } }; @@ -360,26 +360,30 @@ public: /** * @param p_in used to notify system of connect/disconnect events */ - NetInterface(PQInterface *p_in, const RsPeerId& id) - :p(p_in), peerId(id) { return; } + NetInterface(PQInterface *p_in, const RsPeerId& id) : p(p_in), peerId(id) {} -virtual ~NetInterface() - { return; } + virtual ~NetInterface() {} -virtual int connect(const struct sockaddr_storage &raddr) = 0; -virtual int listen() = 0; -virtual int stoplistening() = 0; -virtual int disconnect() = 0; -virtual int reset() = 0; -virtual const RsPeerId& PeerId() { return peerId; } -virtual int getConnectAddress(struct sockaddr_storage &raddr) = 0; + /* TODO + * The data entrypoint is connect(const struct sockaddr_storage &raddr) + * To generalize NetInterface we should have a more general type for raddr + * As an example a string containing an url or encoded like a domain name + */ + virtual int connect(const 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. + virtual int listen() = 0; + virtual int stoplistening() = 0; + 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: -PQInterface *parent() { return p; } + PQInterface *parent() { return p; } private: PQInterface *p; @@ -397,10 +401,9 @@ private: class NetBinInterface: public NetInterface, public BinInterface { public: - NetBinInterface(PQInterface *parent, const RsPeerId& id) - :NetInterface(parent, id) - { return; } -virtual ~NetBinInterface() { return; } + NetBinInterface(PQInterface *parent, const RsPeerId& id) : + NetInterface(parent, id) {} + virtual ~NetBinInterface() {} }; #define CHAN_SIGN_SIZE 16 diff --git a/libretroshare/src/pqi/pqilistener.h b/libretroshare/src/pqi/pqilistener.h index 46e030206..6d02db294 100644 --- a/libretroshare/src/pqi/pqilistener.h +++ b/libretroshare/src/pqi/pqilistener.h @@ -31,21 +31,14 @@ class pqilistener { - public: - - pqilistener() { return; } -virtual ~pqilistener() { return; } - -virtual int tick() { return 1; } -virtual int status() { return 1; } -virtual int setListenAddr(const struct sockaddr_storage &addr) - { - (void) addr; /* suppress unused parameter warning */ - return 1; - } -virtual int setuplisten() { return 1; } -virtual int resetlisten() { return 1; } - +public: + pqilistener() {} + virtual ~pqilistener() {} + virtual int tick() { return 1; } + virtual int status() { return 1; } + virtual int setListenAddr(const sockaddr_storage & /*addr*/) { return 1; } + virtual int setuplisten() { return 1; } + virtual int resetlisten() { return 1; } }; diff --git a/libretroshare/src/pqi/pqissl.cc b/libretroshare/src/pqi/pqissl.cc index b1e80b48a..1a04dcd73 100644 --- a/libretroshare/src/pqi/pqissl.cc +++ b/libretroshare/src/pqi/pqissl.cc @@ -1936,10 +1936,7 @@ bool pqissl::cansend(uint32_t usec) } -RsFileHash pqissl::gethash() -{ - return RsFileHash() ; -} +RsFileHash pqissl::gethash() { return RsFileHash(); } /********** End of Implementation of BinInterface ******************/ diff --git a/libretroshare/src/pqi/pqissl.h b/libretroshare/src/pqi/pqissl.h index faead0981..b4cd267d6 100644 --- a/libretroshare/src/pqi/pqissl.h +++ b/libretroshare/src/pqi/pqissl.h @@ -170,10 +170,13 @@ int Extract_Failed_SSL_Certificate(); // try to get cert anyway. bool CheckConnectionTimeout(); - //protected internal fns that are overloaded for udp case. -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); + /* Do we really need this ? + * It is very specific TCP+SSL stuff and unlikely to be reused. + * In fact we are overloading them in pqissludp case where they do different things or nothing. + */ + 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 */ @@ -206,11 +209,9 @@ virtual int net_internal_fcntl_nonblock(int fd); uint32_t mConnectTimeout; time_t mTimeoutTS; - private: // ssl only fns. -int connectInterface(const struct sockaddr_storage &addr); - + int connectInterface(const struct sockaddr_storage &addr); }; diff --git a/libretroshare/src/pqi/pqissllistener.h b/libretroshare/src/pqi/pqissllistener.h index 27ab26bab..e3a99b7bb 100644 --- a/libretroshare/src/pqi/pqissllistener.h +++ b/libretroshare/src/pqi/pqissllistener.h @@ -49,13 +49,12 @@ class p3PeerMgr; class AcceptedSSL { - public: - +public: int mFd; SSL *mSSL; RsPeerId mPeerId; - - struct sockaddr_storage mAddr; + + sockaddr_storage mAddr; time_t mAcceptTS; }; @@ -64,11 +63,9 @@ class AcceptedSSL class pqissllistenbase: public pqilistener { - public: - - - pqissllistenbase(const struct sockaddr_storage &addr, p3PeerMgr *pm); -virtual ~pqissllistenbase(); +public: + pqissllistenbase(const struct sockaddr_storage &addr, p3PeerMgr *pm); + virtual ~pqissllistenbase(); /*************************************/ /* LISTENER INTERFACE **/ diff --git a/libretroshare/src/pqi/pqissludp.cc b/libretroshare/src/pqi/pqissludp.cc index 5259fb38e..c9b7c7b4d 100644 --- a/libretroshare/src/pqi/pqissludp.cc +++ b/libretroshare/src/pqi/pqissludp.cc @@ -51,22 +51,22 @@ static const uint32_t PQI_SSLUDP_DEF_CONN_PERIOD = 300; /* 5 minutes? */ /********** PQI SSL UDP STUFF **************************************/ -pqissludp::pqissludp(PQInterface *parent, p3LinkMgr *lm) - :pqissl(NULL, parent, lm), tou_bio(NULL), - listen_checktime(0), mConnectPeriod(PQI_SSLUDP_DEF_CONN_PERIOD), mConnectFlags(0), mConnectBandwidth(0) +pqissludp::pqissludp(PQInterface *parent, p3LinkMgr *lm) : + pqissl(NULL, parent, lm), tou_bio(NULL), listen_checktime(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(mConnectProxyAddr); sockaddr_storage_clear(mConnectSrcAddr); - return; } pqissludp::~pqissludp() { - rslog(RSL_ALERT, pqissludpzone, + rslog(RSL_ALERT, pqissludpzone, "pqissludp::~pqissludp -> destroying pqissludp"); /* 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 * be harmless. */ - stoplistening(); /* remove from p3proxy listenqueue */ - reset(); + stoplistening(); /* remove from p3proxy listenqueue */ + reset(); - RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/ + RS_STACK_MUTEX(mSslMtx); if (tou_bio) // this should be in the reset? - { BIO_free(tou_bio); - } - return; } int pqissludp::reset_locked() @@ -153,7 +150,7 @@ int pqissludp::attach() // The Address determination is done centrally -int pqissludp::Initiate_Connection() +int pqissludp::Initiate_Connection() { int err; @@ -349,7 +346,7 @@ int pqissludp::Initiate_Connection() } /********* VERY DIFFERENT **********/ -int pqissludp::Basic_Connection_Complete() +int pqissludp::Basic_Connection_Complete() { rslog(RSL_DEBUG_BASIC, pqissludpzone, "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. int pqissludp::listen() { diff --git a/libretroshare/src/pqi/pqissludp.h b/libretroshare/src/pqi/pqissludp.h index 86b2bc27a..848717bbd 100644 --- a/libretroshare/src/pqi/pqissludp.h +++ b/libretroshare/src/pqi/pqissludp.h @@ -45,7 +45,7 @@ class pqissludp; class cert; -/* This provides a NetBinInterface, which is +/* This provides a NetBinInterface, which is * primarily inherited from pqissl. * fns declared here are different -> all others are identical. */ @@ -53,49 +53,48 @@ class cert; class pqissludp: public pqissl { public: - pqissludp(PQInterface *parent, p3LinkMgr *lm); + pqissludp(PQInterface *parent, p3LinkMgr *lm); -virtual ~pqissludp(); + virtual ~pqissludp(); // NetInterface. // listen fns call the udpproxy. -virtual int listen(); -virtual int stoplistening(); -virtual int tick(); + virtual int listen(); + virtual int stoplistening(); -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_parameter(uint32_t type, uint32_t value); + virtual bool connect_additional_address(uint32_t type, const struct sockaddr_storage &addr); // BinInterface. // These are reimplemented. -virtual bool moretoread(uint32_t usec); -virtual bool cansend(uint32_t usec); + virtual bool moretoread(uint32_t usec); + virtual bool cansend(uint32_t usec); /* UDP always through firewalls -> always bandwidth Limited */ -virtual bool bandwidthLimited() { return true; } + virtual bool bandwidthLimited() { return true; } protected: // pqissludp specific. // called to initiate a connection; -int attach(); + int attach(); -virtual int reset_locked(); + virtual int reset_locked(); -virtual int Initiate_Connection(); -virtual int Basic_Connection_Complete(); + virtual int Initiate_Connection(); + virtual int Basic_Connection_Complete(); -//protected internal fns that are overloaded for udp case. -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); + /* Do we really need this ? + * It is very specific UDP+ToU+SSL stuff and unlikely to be reused. + * In fact we are overloading them here becase they are very do different of pqissl. + */ + 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: BIO *tou_bio; // specific to ssludp. - //int remote_timeout; - //int proxy_timeout; - long listen_checktime; uint32_t mConnectPeriod;