From bc7c4e9e47863aaced1533767eb0b445f6ec8db6 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Mon, 13 Jul 2015 11:03:18 +0000 Subject: [PATCH] Added missing initialization in - pqissl - pqissludp - PeerConnectStateBox - RsTlvBanListEntry - RsServer - TcpStream - PGPCertificateInfo - peerConnectAddress - AudioInputConfig - SpeexInputProcessor - xProgressBar - TBoard Removed unused member: - xProgressBar git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8611 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- src/dht/connectstatebox.cc | 3 +++ src/pgp/pgphandler.h | 2 +- src/pqi/p3linkmgr.cc | 4 +++- src/pqi/pqissl.cc | 2 +- src/pqi/pqissludp.cc | 4 +++- src/rsserver/p3face-server.cc | 1 + src/serialiser/rstlvbanlist.cc | 1 + src/tcponudp/tcpstream.cc | 9 +++++++++ 8 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/dht/connectstatebox.cc b/src/dht/connectstatebox.cc index 14f62bb1e..b54b95167 100644 --- a/src/dht/connectstatebox.cc +++ b/src/dht/connectstatebox.cc @@ -91,6 +91,9 @@ PeerConnectStateBox::PeerConnectStateBox() mNoFailedAttempts = 0; mNextAttemptTS = now; mAttemptLength = 0; + mProxyPortFlags = 0; + mProxyPortChoice = false; + mProxyPortTS = 0; } diff --git a/src/pgp/pgphandler.h b/src/pgp/pgphandler.h index b7ff53662..24e4e8734 100644 --- a/src/pgp/pgphandler.h +++ b/src/pgp/pgphandler.h @@ -21,7 +21,7 @@ typedef std::string (*PassphraseCallback)(void *data, const char *uid_hint, cons class PGPCertificateInfo { public: - PGPCertificateInfo() {} + PGPCertificateInfo() : _trustLvl(0), _validLvl(0), _flags(0), _type(0), _time_stamp(0), _key_index(0) {} std::string _name; std::string _email; diff --git a/src/pqi/p3linkmgr.cc b/src/pqi/p3linkmgr.cc index 6836f8c4b..016e47d5c 100644 --- a/src/pqi/p3linkmgr.cc +++ b/src/pqi/p3linkmgr.cc @@ -87,9 +87,11 @@ const uint32_t P3CONNMGR_UDP_DEFAULT_PERIOD = 30; // this represents how long i void printConnectState(std::ostream &out, peerConnectState &peer); peerConnectAddress::peerConnectAddress() - :delay(0), period(0), type(0), flags(0), ts(0), domain_port(0) + :delay(0), period(0), type(0), flags(0), ts(0), bandwidth(0), domain_port(0) { sockaddr_storage_clear(addr); + sockaddr_storage_clear(proxyaddr); + sockaddr_storage_clear(srcaddr); } diff --git a/src/pqi/pqissl.cc b/src/pqi/pqissl.cc index 76c53fe79..083e4a047 100644 --- a/src/pqi/pqissl.cc +++ b/src/pqi/pqissl.cc @@ -103,7 +103,7 @@ pqissl::pqissl(pqissllistener *l, PQInterface *parent, p3LinkMgr *lm) sslmode(PQISSL_ACTIVE), ssl_connection(NULL), sockfd(-1), readpkt(NULL), pktlen(0), total_len(0), attempt_ts(0), - sameLAN(false), n_read_zero(0), mReadZeroTS(0), + sameLAN(false), n_read_zero(0), mReadZeroTS(0), ssl_connect_timeout(0), mConnectDelay(0), mConnectTS(0), mConnectTimeout(0), mTimeoutTS(0) { diff --git a/src/pqi/pqissludp.cc b/src/pqi/pqissludp.cc index fdc502293..5259fb38e 100644 --- a/src/pqi/pqissludp.cc +++ b/src/pqi/pqissludp.cc @@ -53,11 +53,13 @@ static const uint32_t PQI_SSLUDP_DEF_CONN_PERIOD = 300; /* 5 minutes? */ pqissludp::pqissludp(PQInterface *parent, p3LinkMgr *lm) :pqissl(NULL, parent, lm), tou_bio(NULL), - listen_checktime(0), mConnectPeriod(PQI_SSLUDP_DEF_CONN_PERIOD) + listen_checktime(0), mConnectPeriod(PQI_SSLUDP_DEF_CONN_PERIOD), mConnectFlags(0), mConnectBandwidth(0) { RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/ sockaddr_storage_clear(remote_addr); + sockaddr_storage_clear(mConnectProxyAddr); + sockaddr_storage_clear(mConnectSrcAddr); return; } diff --git a/src/rsserver/p3face-server.cc b/src/rsserver/p3face-server.cc index 1a0267903..ceeca9b7d 100644 --- a/src/rsserver/p3face-server.cc +++ b/src/rsserver/p3face-server.cc @@ -81,6 +81,7 @@ RsServer::RsServer() mPeerMgr = NULL; mLinkMgr = NULL; mNetMgr = NULL; + mHistoryMgr = NULL; pqih = NULL; diff --git a/src/serialiser/rstlvbanlist.cc b/src/serialiser/rstlvbanlist.cc index bad6c1ab8..16cef67dc 100644 --- a/src/serialiser/rstlvbanlist.cc +++ b/src/serialiser/rstlvbanlist.cc @@ -45,6 +45,7 @@ void RsTlvBanListEntry::TlvClear() reason = 0; age = 0; comment.clear(); + masked_bytes = 0; } uint32_t RsTlvBanListEntry::TlvSize() const diff --git a/src/tcponudp/tcpstream.cc b/src/tcponudp/tcpstream.cc index 7c452daf3..b4375b994 100644 --- a/src/tcponudp/tcpstream.cc +++ b/src/tcponudp/tcpstream.cc @@ -93,6 +93,12 @@ TcpStream::TcpStream(UdpSubReceiver *lyr) retransTimerOn(false), retransTimeout(TCP_RETRANS_TIMEOUT), retransTimerTs(0), + keepAliveTimer(0), + lastIncomingPkt(0), + lastSentAck(0), + lastSentWinSize(0), + initOurSeqno(0), + initPeerSeqno(0), lastWriteTF(0),lastReadTF(0), wcount(0), rcount(0), errorState(0), @@ -102,12 +108,15 @@ TcpStream::TcpStream(UdpSubReceiver *lyr) congestThreshold(TCP_MAX_WIN), congestWinSize(MAX_SEG), congestUpdate(0), + ttl(0), mTTL_period(0), mTTL_start(0), mTTL_end(0), peerKnown(false), udp(lyr) { + sockaddr_clear(&peeraddr); + return; }