ui,tunnel: add lastest handshake to peer details

Signed-off-by: Mikael Magnusson <mikma@users.sourceforge.net>

3 files changed, 68 insertions, 18 deletions

diff --git a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
index c8158a72..5d544f56 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/GoBackend.java
@@ -49,6 +49,8 @@ import io.grpc.ManagedChannelBuilder;
 import io.grpc.okhttp.OkHttpChannelBuilder;
 import io.grpc.stub.StreamObserver;
 
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -179,10 +181,17 @@ public final class GoBackend implements Backend {
         Key key = null;
         long rx = 0;
         long tx = 0;
+        long handshakeSec = 0;
+        int handshakeNSec = 0;
         for (final String line : config.split("\\n")) {
             if (line.startsWith("public_key=")) {
-                if (key != null)
-                    stats.add(key, rx, tx);
+                if (key != null) {
+                    LocalDateTime handshake = null;
+                    if (handshakeSec > 0) {
+                        handshake = LocalDateTime.ofEpochSecond(handshakeSec, handshakeNSec, ZoneOffset.UTC);
+                    }
+                    stats.add(key, rx, tx, handshake);
+                }
                 rx = 0;
                 tx = 0;
                 try {
@@ -206,10 +215,31 @@ public final class GoBackend implements Backend {
                 } catch (final NumberFormatException ignored) {
                     tx = 0;
                 }
+            } else if (line.startsWith("last_handshake_time_sec=")) {
+                if (key == null)
+                    continue;
+                try {
+                    handshakeSec = Long.parseLong(line.substring(24));
+                } catch (final NumberFormatException ignored) {
+                    handshakeSec = 0;
+                }
+            } else if (line.startsWith("last_handshake_time_nsec=")) {
+                if (key == null)
+                    continue;
+                try {
+                    handshakeNSec = Integer.parseInt(line.substring(25));
+                } catch (final NumberFormatException ignored) {
+                    handshakeNSec = 0;
+                }
+            }
+        }
+        if (key != null) {
+            LocalDateTime handshake = null;
+            if (handshakeSec > 0) {
+                handshake = LocalDateTime.ofEpochSecond(handshakeSec, handshakeNSec, ZoneOffset.UTC);
             }
+            stats.add(key, rx, tx, handshake);
         }
-        if (key != null)
-            stats.add(key, rx, tx);
         return stats;
     }
 
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
index 5d658019..322e766f 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/Statistics.java
@@ -11,6 +11,7 @@ import android.util.Pair;
 import com.wireguard.crypto.Key;
 import com.wireguard.util.NonNullForAll;
 
+import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -19,7 +20,19 @@ import java.util.Map;
  */
 @NonNullForAll
 public class Statistics {
-    private final Map<Key, Pair<Long, Long>> peerBytes = new HashMap<>();
+    private static class Stat {
+        long rx;
+        long tx;
+        LocalDateTime lastHandshake;
+
+        Stat(long rx, long tx, LocalDateTime lastHandshake) {
+            this.rx = rx;
+            this.tx = tx;
+            this.lastHandshake = lastHandshake;
+        }
+    }
+
+    private final Map<Key, Stat> peerBytes = new HashMap<>();
     private long lastTouched = SystemClock.elapsedRealtime();
 
     Statistics() {
@@ -34,8 +47,8 @@ public class Statistics {
      * @param tx  The transmitted traffic for the {@link com.wireguard.config.Peer} referenced by
      *            the provided {@link Key}. This value is in bytes.
      */
-    void add(final Key key, final long rx, final long tx) {
-        peerBytes.put(key, Pair.create(rx, tx));
+    void add(final Key key, final long rx, final long tx, final LocalDateTime lastHandshake) {
+        peerBytes.put(key, new Stat(rx, tx, lastHandshake));
         lastTouched = SystemClock.elapsedRealtime();
     }
 
@@ -56,10 +69,10 @@ public class Statistics {
      * @return a long representing the number of bytes received by this peer.
      */
     public long peerRx(final Key peer) {
-        final Pair<Long, Long> rxTx = peerBytes.get(peer);
-        if (rxTx == null)
+        final Stat stat = peerBytes.get(peer);
+        if (stat == null)
             return 0;
-        return rxTx.first;
+        return stat.rx;
     }
 
     /**
@@ -70,10 +83,17 @@ public class Statistics {
      * @return a long representing the number of bytes transmitted by this peer.
      */
     public long peerTx(final Key peer) {
-        final Pair<Long, Long> rxTx = peerBytes.get(peer);
-        if (rxTx == null)
+        final Stat stat = peerBytes.get(peer);
+        if (stat == null)
             return 0;
-        return rxTx.second;
+        return stat.tx;
+    }
+
+    public LocalDateTime peerLastHandshake(final Key peer) {
+        final Stat stat = peerBytes.get(peer);
+        if (stat == null)
+            return null;
+        return stat.lastHandshake;
     }
 
     /**
@@ -93,8 +113,8 @@ public class Statistics {
      */
     public long totalRx() {
         long rx = 0;
-        for (final Pair<Long, Long> val : peerBytes.values()) {
-            rx += val.first;
+        for (final Stat val : peerBytes.values()) {
+            rx += val.rx;
         }
         return rx;
     }
@@ -106,8 +126,8 @@ public class Statistics {
      */
     public long totalTx() {
         long tx = 0;
-        for (final Pair<Long, Long> val : peerBytes.values()) {
-            tx += val.second;
+        for (final Stat val : peerBytes.values()) {
+            tx += val.tx;
         }
         return tx;
     }
diff --git a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
index 3121c996..d0dc6a46 100644
--- a/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+++ b/tunnel/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
@@ -93,7 +93,7 @@ public final class WgQuickBackend implements Backend {
             if (parts.length != 3)
                 continue;
             try {
-                stats.add(Key.fromBase64(parts[0]), Long.parseLong(parts[1]), Long.parseLong(parts[2]));
+                stats.add(Key.fromBase64(parts[0]), Long.parseLong(parts[1]), Long.parseLong(parts[2]), null);
             } catch (final Exception ignored) {
             }
         }