aboutsummaryrefslogtreecommitdiff
path: root/nxcomp/Proxy.cpp
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:52 +0100
committerReinhard Tartler <siretart@tauware.de>2011-11-13 09:27:52 +0100
commitd7a8d67d760a80962821f6951caee5a9c807f5be (patch)
treeebe9c64f26e37a72b1e2cf794d694eeab8627295 /nxcomp/Proxy.cpp
parent3e924126b56c4d421e8263d25f6b14aa4ceed047 (diff)
downloadnx-libs-d7a8d67d760a80962821f6951caee5a9c807f5be.tar.gz
nx-libs-d7a8d67d760a80962821f6951caee5a9c807f5be.tar.bz2
nx-libs-d7a8d67d760a80962821f6951caee5a9c807f5be.zip
Imported nxcomp-3.1.0-6.tar.gznxcomp/3.1.0-6
Summary: Imported nxcomp-3.1.0-6.tar.gz Keywords: Imported nxcomp-3.1.0-6.tar.gz into Git repository
Diffstat (limited to 'nxcomp/Proxy.cpp')
-rwxr-xr-xnxcomp/Proxy.cpp34
1 files changed, 11 insertions, 23 deletions
diff --git a/nxcomp/Proxy.cpp b/nxcomp/Proxy.cpp
index 371dfe645..54a5af406 100755
--- a/nxcomp/Proxy.cpp
+++ b/nxcomp/Proxy.cpp
@@ -3647,32 +3647,20 @@ int Proxy::handlePing()
if (diffPing >= (control -> PingTimeout -
control -> LatencyTimeout * 5))
{
- if (tokens_[token_control].remaining > 0)
- {
- #if defined(TEST) || defined(INFO) || defined(PING)
- *logofs << "Proxy: Sending a new ping at " << strMsTimestamp()
- << " with " << tokens_[token_control].remaining
- << " tokens and elapsed in " << diffIn << " out "
- << diffOut << " ping " << diffPing
- << ".\n" << logofs_flush;
- #endif
-
- if (handleFrame(frame_ping) < 0)
- {
- return -1;
- }
-
- timeouts_.pingTs = nowTs;
- }
#if defined(TEST) || defined(INFO) || defined(PING)
- else
+ *logofs << "Proxy: Sending a new ping at " << strMsTimestamp()
+ << " with " << tokens_[token_control].remaining
+ << " tokens and elapsed in " << diffIn << " out "
+ << diffOut << " ping " << diffPing
+ << ".\n" << logofs_flush;
+ #endif
+
+ if (handleFrame(frame_ping) < 0)
{
- *logofs << "Proxy: WARNING! Can't send a new ping "
- << "with no tokens and elapsed in " << diffIn
- << " out " << diffOut << " ping " << diffPing
- << ".\n" << logofs_flush;
+ return -1;
}
- #endif
+
+ timeouts_.pingTs = nowTs;
}
#if defined(TEST) || defined(INFO) || defined(PING)
else