This commit is contained in:
jrandom
2005-11-15 06:37:20 +00:00
committed by zzz
parent b1a5f61ba2
commit 5241953e5d
2 changed files with 11 additions and 8 deletions

View File

@ -564,12 +564,15 @@ public class OutboundMessageFragments {
if (state != null) { if (state != null) {
int numSends = state.getMaxSends(); int numSends = state.getMaxSends();
if (state.getMessage() != null) if (state.getMessage() != null) {
state.getMessage().timestamp("acked after " + numSends PeerState peer = state.getPeer();
+ " lastReceived: " if (peer != null)
+ (_context.clock().now() - state.getPeer().getLastReceiveTime()) state.getMessage().timestamp("acked after " + numSends
+ " lastSentFully: " + " lastReceived: "
+ (_context.clock().now() - state.getPeer().getLastSendFullyTime())); + (_context.clock().now() - peer.getLastReceiveTime())
+ " lastSentFully: "
+ (_context.clock().now() - peer.getLastSendFullyTime()));
}
if (_log.shouldLog(Log.INFO)) if (_log.shouldLog(Log.INFO))

View File

@ -311,8 +311,8 @@ class PeerTestManager {
(from.getPort() == state.getCharliePort()) ) { (from.getPort() == state.getCharliePort()) ) {
receiveFromCharlieAsBob(from, state); receiveFromCharlieAsBob(from, state);
} else { } else {
if (_log.shouldLog(Log.ERROR)) if (_log.shouldLog(Log.WARN))
_log.error("Received from a fourth party as bob! alice: " + state.getAliceIP() + ", charlie: " + state.getCharlieIP() + ", dave: " + from); _log.warn("Received from a fourth party as bob! alice: " + state.getAliceIP() + ", charlie: " + state.getCharlieIP() + ", dave: " + from);
} }
} else if (state.getOurRole() == PeerTestState.CHARLIE) { } else if (state.getOurRole() == PeerTestState.CHARLIE) {
if ( (testIP == null) || (testPort <= 0) ) { if ( (testIP == null) || (testPort <= 0) ) {