From afd937ee5405d184d34efc3b4b0798b75fbdc7f7 Mon Sep 17 00:00:00 2001 From: paweldomas Date: Thu, 21 Nov 2013 18:51:46 +0000 Subject: [PATCH] Commits Carl Hasselskog patch for feeding PTCP stack's clock with valid time values. --- src/org/ice4j/pseudotcp/PseudoTCPBase.java | 2 -- src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java | 6 +++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/org/ice4j/pseudotcp/PseudoTCPBase.java b/src/org/ice4j/pseudotcp/PseudoTCPBase.java index 0051f09..cf24cae 100755 --- a/src/org/ice4j/pseudotcp/PseudoTCPBase.java +++ b/src/org/ice4j/pseudotcp/PseudoTCPBase.java @@ -416,8 +416,6 @@ public class PseudoTCPBase return; } - now = now & 0xFFFFFFFFL; - // Check if it's time to retransmit a segment if (m_rto_base > 0 && (timeDiff(m_rto_base + m_rx_rto, now) <= 0)) { diff --git a/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java b/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java index 2b96a0b..ce33e8c 100755 --- a/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java +++ b/src/org/ice4j/pseudotcp/PseudoTcpSocketImpl.java @@ -459,7 +459,7 @@ class PseudoTcpSocketImpl */ private void startThreads() { - pseudoTcp.notifyClock(System.currentTimeMillis()); + pseudoTcp.notifyClock(PseudoTCPBase.now()); receiveThread = new Thread(new Runnable() { public void run() @@ -713,8 +713,8 @@ class PseudoTcpSocketImpl { synchronized (pseudoTcp) { - pseudoTcp.notifyClock(System.currentTimeMillis()); - sleep = pseudoTcp.getNextClock(System.currentTimeMillis()); + pseudoTcp.notifyClock(PseudoTCPBase.now()); + sleep = pseudoTcp.getNextClock(PseudoTCPBase.now()); } //there might be negative interval even if there's no error