feat: block-count

Author: SgrA*

Sources/Shared/Model/TunnelConfiguration+WgQuickConfig.swift

@@ -29,6 +29,7 @@ extension TunnelConfiguration {
         case peerHasInvalidEndpoint(String)
         case peerHasInvalidPersistentKeepAlive(String)
         case peerHasInvalidTransferBytes(String)
+        case peerHasInvalidBlockedCount(String)
         case peerHasInvalidLastHandshakeTime(String)
         case peerHasUnrecognizedKey(String)
         case multiplePeersWithSamePublicKey

Sources/WireGuardApp/Tunnel/TunnelConfiguration+UapiConfig.swift

@@ -52,7 +52,7 @@ extension TunnelConfiguration {
             }
 
             let interfaceSectionKeys: Set<String> = ["private_key", "listen_port", "fwmark"]
-            let peerSectionKeys: Set<String> = ["public_key", "preshared_key", "allowed_ip", "endpoint", "persistent_keepalive_interval", "last_handshake_time_sec", "last_handshake_time_nsec", "rx_bytes", "tx_bytes", "protocol_version"]
+            let peerSectionKeys: Set<String> = ["public_key", "preshared_key", "allowed_ip", "endpoint", "persistent_keepalive_interval", "last_handshake_time_sec", "last_handshake_time_nsec", "rx_bytes", "tx_bytes", "protocol_version", "blocked"]
 
             if parserState == .inInterfaceSection {
                 guard interfaceSectionKeys.contains(key) else {
@@ -163,6 +163,13 @@ extension TunnelConfiguration {
             if txBytes != 0 {
                 peer.txBytes = txBytes
             }
+         if let blockedString = attributes["blocked"] {
+            guard let blocked = UInt64(blockedString) else {
+                throw ParseError.peerHasInvalidBlockedCount(blockedString)
+            }
+            if blocked != 0 {
+                peer.blocked = blocked
+            }
         }
         if let lastHandshakeTimeSecString = attributes["last_handshake_time_sec"] {
             var lastHandshakeTimeSince1970: TimeInterval = 0

Sources/WireGuardApp/UI/TunnelViewModel.swift

@@ -45,6 +45,7 @@ class TunnelViewModel {
         case allowedIPs
         case rxBytes
         case txBytes
+        case blocked
         case lastHandshakeTime
         case excludePrivateIPs
         case deletePeer
@@ -58,6 +59,7 @@ class TunnelViewModel {
             case .allowedIPs: return tr("tunnelPeerAllowedIPs")
             case .rxBytes: return tr("tunnelPeerRxBytes")
             case .txBytes: return tr("tunnelPeerTxBytes")
+            case .blocked: return tr("blocked")
             case .lastHandshakeTime: return tr("tunnelPeerLastHandshakeTime")
             case .excludePrivateIPs: return tr("tunnelPeerExcludePrivateIPs")
             case .deletePeer: return tr("deletePeerButtonTitle")
@@ -323,6 +325,9 @@ class TunnelViewModel {
             if let txBytes = config.txBytes {
                 scratchpad[.txBytes] = prettyBytes(txBytes)
             }
+            if let blocked = config.blocked {
+                scratchpad[.blocked] = prettyBytes(blocked)
+            }
             if let lastHandshakeTime = config.lastHandshakeTime {
                 scratchpad[.lastHandshakeTime] = prettyTimeAgo(timestamp: lastHandshakeTime)
             }

Sources/WireGuardApp/UI/iOS/ViewController/TunnelDetailTableViewController.swift

@@ -21,7 +21,7 @@ class TunnelDetailTableViewController: UITableViewController {
     static let peerFields: [TunnelViewModel.PeerField] = [
         .publicKey, .preSharedKey, .endpoint,
         .allowedIPs, .persistentKeepAlive,
-        .rxBytes, .txBytes, .lastHandshakeTime
+        .rxBytes, .txBytes, .blocked, .lastHandshakeTime
     ]
 
     static let onDemandFields: [ActivateOnDemandViewModel.OnDemandField] = [

Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift

@@ -367,7 +367,7 @@ extension TunnelEditTableViewController {
             cell.keyboardType = .numberPad
         case .excludePrivateIPs, .deletePeer:
             cell.keyboardType = .default
-        case .rxBytes, .txBytes, .lastHandshakeTime:
+        case .rxBytes, .txBytes, .blocked, .lastHandshakeTime:
             fatalError()
         }
 

Sources/WireGuardApp/UI/macOS/ParseError+WireGuardAppError.swift

@@ -45,6 +45,8 @@ extension TunnelConfiguration.ParseError: WireGuardAppError {
             return (tr(format: "macAlertUnrecognizedPeerKey (%@)", value), tr("macAlertInfoUnrecognizedPeerKey"))
         case .peerHasInvalidTransferBytes(let line):
             return (tr(format: "macAlertInvalidLine (%@)", String(line)), "")
+         case .peerHasInvalidBlockedCount(let line):
+            return (tr(format: "macAlertInvalidLine (%@)", String(line)), "")
         case .peerHasInvalidLastHandshakeTime(let line):
             return (tr(format: "macAlertInvalidLine (%@)", String(line)), "")
         case .multiplePeersWithSamePublicKey:

Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift

@@ -41,7 +41,7 @@ class TunnelDetailTableViewController: NSViewController {
     static let peerFields: [TunnelViewModel.PeerField] = [
         .publicKey, .preSharedKey, .endpoint,
         .allowedIPs, .persistentKeepAlive,
-        .rxBytes, .txBytes, .lastHandshakeTime
+        .rxBytes, .txBytes, .blocked, .lastHandshakeTime
     ]
 
     static let onDemandFields: [ActivateOnDemandViewModel.OnDemandField] = [

Sources/WireGuardKit/PeerConfiguration.swift

@@ -11,6 +11,7 @@ public struct PeerConfiguration {
     public var persistentKeepAlive: UInt16?
     public var rxBytes: UInt64?
     public var txBytes: UInt64?
+    public var blocked: UInt64?
     public var lastHandshakeTime: Date?
 
     public init(publicKey: PublicKey) {

Sources/WireGuardKitGo/Makefile

@@ -21,11 +21,11 @@ GOARCH_x86_64 := amd64
 GOOS_macosx := darwin
 GOOS_iphoneos := ios
 
-GO_VERSION := 1.17.13
+GO_VERSION := 1.20.2
 GO_PLATFORM := $(shell uname -s | tr '[:upper:]' '[:lower:]')-$(GOARCH_$(shell uname -m))
 GO_TARBALL := go$(GO_VERSION).$(GO_PLATFORM).tar.gz
-GO_HASH_darwin-amd64 := 0fea4e2498067dcf199c71be78bb940f7861efd8ae03c672992d2d65d31f9fc8
-GO_HASH_darwin-arm64 := e4ccc9c082d91eaa0b866078b591fc97d24b91495f12deb3dd2d8eda4e55a6ea
+GO_HASH_darwin-amd64 := c93b8ced9517d07e1cd4c362c6e2d5242cb139e29b417a328fbf19aded08764c
+GO_HASH_darwin-arm64 := 7343c87f19e79c0063532e82e1c4d6f42175a32d99f7a4d15e658e88bf97f885
 
 build: $(DESTDIR)/libwg-go.a
 version-header: $(DESTDIR)/wireguard-go-version.h

Sources/WireGuardKitGo/go.mod

@@ -1,14 +1,16 @@
 module golang.zx2c4.com/wireguard/apple
 
-go 1.17
+go 1.20
 
 require (
-	golang.org/x/sys v0.5.0
-	golang.zx2c4.com/wireguard v0.0.0-20230209153558-1e2c3e5a3c14
+	golang.org/x/sys v0.6.0
+	golang.zx2c4.com/wireguard v0.0.0-20230309202816-787da6420c65
 )
 
 require (
-	golang.org/x/crypto v0.6.0 // indirect
-	golang.org/x/net v0.6.0 // indirect
+	golang.org/x/crypto v0.7.0 // indirect
+	golang.org/x/net v0.8.0 // indirect
 	golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
 )
+
+replace golang.zx2c4.com/wireguard => github.com/safehousetech/wireguard-go v0.0.20200321-0.20230312122755-9baf4cf4bcfe