Refactoring

aaxx · Mar 11, 2019 · f98bb79 · f98bb79
1 parent f131471
commit f98bb79
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 24 deletions.
diff --git a/tls/src/main/java/org/bouncycastle/tls/DTLSRecordLayer.java b/tls/src/main/java/org/bouncycastle/tls/DTLSRecordLayer.java
@@ -254,7 +254,7 @@ record = new byte[receiveLimit];
             }
 
             currentTimeMillis = System.currentTimeMillis();
-            waitMillis = getWaitMillis(timeout, currentTimeMillis);
+            waitMillis = Timeout.getWaitMillis(timeout, currentTimeMillis);
         }
 
         return -1;
@@ -671,27 +671,4 @@ private static long getMacSequenceNumber(int epoch, long sequence_number)
     {
         return ((epoch & 0xFFFFFFFFL) << 48) | sequence_number;
     }
-
-//    private static int getWaitMillis(Timeout t)
-//    {
-//        return getWaitMillis(t, System.currentTimeMillis());
-//    }
-
-    private static int getWaitMillis(Timeout timeout, long currentTimeMillis)
-    {
-        if (null == timeout)
-        {
-            return 0;
-        }
-        long remainingMillis = timeout.remainingMillis(currentTimeMillis);
-        if (remainingMillis < 1L)
-        {
-            return -1;
-        }
-        if (remainingMillis > Integer.MAX_VALUE)
-        {
-            return Integer.MAX_VALUE;
-        }
-        return (int)remainingMillis;
-    }
 }
diff --git a/tls/src/main/java/org/bouncycastle/tls/Timeout.java b/tls/src/main/java/org/bouncycastle/tls/Timeout.java
@@ -41,4 +41,27 @@ synchronized long remainingMillis(long currentTimeMillis)
 
         return remaining;
     }
+
+    static int getWaitMillis(Timeout timeout)
+    {
+        return getWaitMillis(timeout, System.currentTimeMillis());
+    }
+
+    static int getWaitMillis(Timeout timeout, long currentTimeMillis)
+    {
+        if (null == timeout)
+        {
+            return 0;
+        }
+        long remainingMillis = timeout.remainingMillis(currentTimeMillis);
+        if (remainingMillis < 1L)
+        {
+            return -1;
+        }
+        if (remainingMillis > Integer.MAX_VALUE)
+        {
+            return Integer.MAX_VALUE;
+        }
+        return (int)remainingMillis;
+    }
 }