mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-07 14:12:43 -04:00
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
This commit is contained in:
parent
502d2353cb
commit
c76141ed65
13 changed files with 31 additions and 6 deletions
|
@ -91,6 +91,9 @@ PeerConnectStateBox::PeerConnectStateBox()
|
||||||
mNoFailedAttempts = 0;
|
mNoFailedAttempts = 0;
|
||||||
mNextAttemptTS = now;
|
mNextAttemptTS = now;
|
||||||
mAttemptLength = 0;
|
mAttemptLength = 0;
|
||||||
|
mProxyPortFlags = 0;
|
||||||
|
mProxyPortChoice = false;
|
||||||
|
mProxyPortTS = 0;
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -21,7 +21,7 @@ typedef std::string (*PassphraseCallback)(void *data, const char *uid_hint, cons
|
||||||
class PGPCertificateInfo
|
class PGPCertificateInfo
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
PGPCertificateInfo() {}
|
PGPCertificateInfo() : _trustLvl(0), _validLvl(0), _flags(0), _type(0), _time_stamp(0), _key_index(0) {}
|
||||||
|
|
||||||
std::string _name;
|
std::string _name;
|
||||||
std::string _email;
|
std::string _email;
|
||||||
|
|
|
@ -87,9 +87,11 @@ const uint32_t P3CONNMGR_UDP_DEFAULT_PERIOD = 30; // this represents how long i
|
||||||
void printConnectState(std::ostream &out, peerConnectState &peer);
|
void printConnectState(std::ostream &out, peerConnectState &peer);
|
||||||
|
|
||||||
peerConnectAddress::peerConnectAddress()
|
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(addr);
|
||||||
|
sockaddr_storage_clear(proxyaddr);
|
||||||
|
sockaddr_storage_clear(srcaddr);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -103,7 +103,7 @@ pqissl::pqissl(pqissllistener *l, PQInterface *parent, p3LinkMgr *lm)
|
||||||
sslmode(PQISSL_ACTIVE), ssl_connection(NULL), sockfd(-1),
|
sslmode(PQISSL_ACTIVE), ssl_connection(NULL), sockfd(-1),
|
||||||
readpkt(NULL), pktlen(0), total_len(0),
|
readpkt(NULL), pktlen(0), total_len(0),
|
||||||
attempt_ts(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),
|
mConnectDelay(0), mConnectTS(0),
|
||||||
mConnectTimeout(0), mTimeoutTS(0)
|
mConnectTimeout(0), mTimeoutTS(0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -53,11 +53,13 @@ static const uint32_t PQI_SSLUDP_DEF_CONN_PERIOD = 300; /* 5 minutes? */
|
||||||
|
|
||||||
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), mConnectPeriod(PQI_SSLUDP_DEF_CONN_PERIOD)
|
listen_checktime(0), mConnectPeriod(PQI_SSLUDP_DEF_CONN_PERIOD), mConnectFlags(0), mConnectBandwidth(0)
|
||||||
{
|
{
|
||||||
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/
|
RsStackMutex stack(mSslMtx); /**** LOCKED MUTEX ****/
|
||||||
|
|
||||||
sockaddr_storage_clear(remote_addr);
|
sockaddr_storage_clear(remote_addr);
|
||||||
|
sockaddr_storage_clear(mConnectProxyAddr);
|
||||||
|
sockaddr_storage_clear(mConnectSrcAddr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -81,6 +81,7 @@ RsServer::RsServer()
|
||||||
mPeerMgr = NULL;
|
mPeerMgr = NULL;
|
||||||
mLinkMgr = NULL;
|
mLinkMgr = NULL;
|
||||||
mNetMgr = NULL;
|
mNetMgr = NULL;
|
||||||
|
mHistoryMgr = NULL;
|
||||||
|
|
||||||
pqih = NULL;
|
pqih = NULL;
|
||||||
|
|
||||||
|
|
|
@ -45,6 +45,7 @@ void RsTlvBanListEntry::TlvClear()
|
||||||
reason = 0;
|
reason = 0;
|
||||||
age = 0;
|
age = 0;
|
||||||
comment.clear();
|
comment.clear();
|
||||||
|
masked_bytes = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
uint32_t RsTlvBanListEntry::TlvSize() const
|
uint32_t RsTlvBanListEntry::TlvSize() const
|
||||||
|
|
|
@ -93,6 +93,12 @@ TcpStream::TcpStream(UdpSubReceiver *lyr)
|
||||||
retransTimerOn(false),
|
retransTimerOn(false),
|
||||||
retransTimeout(TCP_RETRANS_TIMEOUT),
|
retransTimeout(TCP_RETRANS_TIMEOUT),
|
||||||
retransTimerTs(0),
|
retransTimerTs(0),
|
||||||
|
keepAliveTimer(0),
|
||||||
|
lastIncomingPkt(0),
|
||||||
|
lastSentAck(0),
|
||||||
|
lastSentWinSize(0),
|
||||||
|
initOurSeqno(0),
|
||||||
|
initPeerSeqno(0),
|
||||||
lastWriteTF(0),lastReadTF(0),
|
lastWriteTF(0),lastReadTF(0),
|
||||||
wcount(0), rcount(0),
|
wcount(0), rcount(0),
|
||||||
errorState(0),
|
errorState(0),
|
||||||
|
@ -102,12 +108,15 @@ TcpStream::TcpStream(UdpSubReceiver *lyr)
|
||||||
congestThreshold(TCP_MAX_WIN),
|
congestThreshold(TCP_MAX_WIN),
|
||||||
congestWinSize(MAX_SEG),
|
congestWinSize(MAX_SEG),
|
||||||
congestUpdate(0),
|
congestUpdate(0),
|
||||||
|
ttl(0),
|
||||||
mTTL_period(0),
|
mTTL_period(0),
|
||||||
mTTL_start(0),
|
mTTL_start(0),
|
||||||
mTTL_end(0),
|
mTTL_end(0),
|
||||||
peerKnown(false),
|
peerKnown(false),
|
||||||
udp(lyr)
|
udp(lyr)
|
||||||
{
|
{
|
||||||
|
sockaddr_clear(&peeraddr);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -65,6 +65,7 @@ AudioInputConfig::AudioInputConfig(QWidget * parent, Qt::WindowFlags flags)
|
||||||
inputAudioProcessor = NULL;
|
inputAudioProcessor = NULL;
|
||||||
inputAudioDevice = NULL;
|
inputAudioDevice = NULL;
|
||||||
abSpeech = NULL;
|
abSpeech = NULL;
|
||||||
|
qtTick = NULL;
|
||||||
|
|
||||||
// Create the video pipeline.
|
// Create the video pipeline.
|
||||||
//
|
//
|
||||||
|
|
|
@ -84,7 +84,8 @@ SpeexInputProcessor::SpeexInputProcessor(QObject *parent) : QIODevice(parent),
|
||||||
//pfMicInput = pfEchoInput = pfOutput = NULL;
|
//pfMicInput = pfEchoInput = pfOutput = NULL;
|
||||||
|
|
||||||
iRealTimeBitrate = 0;
|
iRealTimeBitrate = 0;
|
||||||
dPeakSignal = dPeakSpeaker = dPeakMic = dPeakCleanMic = dVoiceAcivityLevel = 0.0;
|
dPeakSignal = dPeakSpeaker = dMaxMic = dPeakMic = dPeakCleanMic = dVoiceAcivityLevel = 0.0;
|
||||||
|
dMaxMic = 0.0;
|
||||||
|
|
||||||
//if (g.uiSession) {
|
//if (g.uiSession) {
|
||||||
//TODO : get the maxbitrate from a rs service or a dynamic code
|
//TODO : get the maxbitrate from a rs service or a dynamic code
|
||||||
|
|
|
@ -338,11 +338,16 @@ TBoard::TBoard(QWidget *parent) {
|
||||||
|
|
||||||
setFocusPolicy(Qt::StrongFocus);
|
setFocusPolicy(Qt::StrongFocus);
|
||||||
isStarted = false;
|
isStarted = false;
|
||||||
|
isWaitingAfterLine = false;
|
||||||
|
numLinesRemoved = 0;
|
||||||
|
numPiecesDropped = 0;
|
||||||
isPaused = false;
|
isPaused = false;
|
||||||
clearBoard();
|
clearBoard();
|
||||||
nextPiece.setRandomShape();
|
nextPiece.setRandomShape();
|
||||||
score = 0;
|
score = 0;
|
||||||
level = 0;
|
level = 0;
|
||||||
|
curX = 0;
|
||||||
|
curY = 0;
|
||||||
|
|
||||||
maxScore = Settings->value("/about/maxsc").toInt();
|
maxScore = Settings->value("/about/maxsc").toInt();
|
||||||
}
|
}
|
||||||
|
|
|
@ -45,6 +45,7 @@ xProgressBar::xProgressBar(const FileProgressInfo& pinfo,QRect rect, QPainter *p
|
||||||
this->schemaIndex = schemaIndex;
|
this->schemaIndex = schemaIndex;
|
||||||
this->rect = rect;
|
this->rect = rect;
|
||||||
this->painter = painter;
|
this->painter = painter;
|
||||||
|
displayText = false;
|
||||||
// set the progress bar colors
|
// set the progress bar colors
|
||||||
setColor();
|
setColor();
|
||||||
// configure span
|
// configure span
|
||||||
|
|
|
@ -58,7 +58,6 @@ class xProgressBar : public QObject
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
private:
|
private:
|
||||||
// progress vlues
|
// progress vlues
|
||||||
uint32_t _nb_chunks ;
|
|
||||||
int schemaIndex;
|
int schemaIndex;
|
||||||
bool displayText;
|
bool displayText;
|
||||||
int vSpan;
|
int vSpan;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue