From 8bfb2487ae1c471cf8740861a54e5e096577ec76 Mon Sep 17 00:00:00 2001
From: Andrew Bulhak <andrew.bulhak@mullvad.net>
Date: Wed, 18 Sep 2024 15:31:04 +0200
Subject: [PATCH] Changes from pull request

---
 ios/PacketTunnelCore/Pinger/TunnelPinger.swift   | 6 ++----
 ios/PacketTunnelCoreTests/Mocks/PingerMock.swift | 4 ++--
 ios/PacketTunnelCoreTests/PingerTests.swift      | 4 ++--
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ios/PacketTunnelCore/Pinger/TunnelPinger.swift b/ios/PacketTunnelCore/Pinger/TunnelPinger.swift
index ac5b5eed5337..f011fc9a01b8 100644
--- a/ios/PacketTunnelCore/Pinger/TunnelPinger.swift
+++ b/ios/PacketTunnelCore/Pinger/TunnelPinger.swift
@@ -32,9 +32,7 @@ public final class TunnelPinger: PingerProtocol {
         }
     }
 
-    var socketHandle: Int32?
-
-    var pingProvider: ICMPPingProvider
+    private var pingProvider: ICMPPingProvider
 
     private let logger: Logger
 
@@ -68,6 +66,7 @@ public final class TunnelPinger: PingerProtocol {
             let reply: PingerReply
             do {
                 try pingProvider.sendICMPPing(seqNumber: sequenceNumber)
+                // NOTE: we cheat here by returning the destination address we were passed, rather than parsing it from the packet on the other side of the FFI boundary.
                 reply = .success(destAddress, sequenceNumber)
             } catch {
                 reply = .parseError(error)
@@ -76,7 +75,6 @@ public final class TunnelPinger: PingerProtocol {
 
             replyQueue.async { [weak self] in
                 guard let self else { return }
-                // NOTE: we cheat here by returning the destination address we were passed, rather than parsing it from the packet on the other side of the FFI boundary.
                 self.onReply?(reply)
             }
         }
diff --git a/ios/PacketTunnelCoreTests/Mocks/PingerMock.swift b/ios/PacketTunnelCoreTests/Mocks/PingerMock.swift
index ab80bee9144b..0dd16f6f65b3 100644
--- a/ios/PacketTunnelCoreTests/Mocks/PingerMock.swift
+++ b/ios/PacketTunnelCoreTests/Mocks/PingerMock.swift
@@ -86,7 +86,7 @@ class PingerMock: PingerProtocol {
 
         networkStatsReporting.reportBytesSent(UInt64(icmpPacketSize))
 
-        return PingerSendResult(sequenceNumber: nextSequenceId, bytesSent: icmpPacketSize)
+        return PingerSendResult(sequenceNumber: nextSequenceId)
     }
 
     // MARK: - Types
@@ -96,7 +96,7 @@ class PingerMock: PingerProtocol {
         var sequenceId: UInt16 = 0
         var isSocketOpen = false
         var onReply: ((PingerReply) -> Void)?
-        var destAddress: IPv4Address? = nil
+        var destAddress: IPv4Address?
 
         mutating func incrementSequenceId() -> UInt16 {
             sequenceId += 1
diff --git a/ios/PacketTunnelCoreTests/PingerTests.swift b/ios/PacketTunnelCoreTests/PingerTests.swift
index 12fe12ddc5b8..e849b0fda242 100644
--- a/ios/PacketTunnelCoreTests/PingerTests.swift
+++ b/ios/PacketTunnelCoreTests/PingerTests.swift
@@ -25,8 +25,8 @@ final class PingerTests: XCTestCase {
             }
         }
 
-        try pinger.openSocket(bindTo: "lo0")
-        sendResult = try pinger.send(to: .loopback)
+        try pinger.openSocket(bindTo: "lo0", destAddress: .loopback)
+        sendResult = try pinger.send()
 
         waitForExpectations(timeout: .UnitTest.timeout)
     }