From: Roopesh Chander <roop@roopc.net>
Date: Tue, 15 Jan 2019 20:21:50 +0000 (+0530)
Subject: macOS: Use tunnelOverheadBytes for automatic MTU in macOS
X-Git-Tag: 0.0.20190207-1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f63c9fd5983f96cfc43891b5301830549b472c6d;p=thirdparty%2Fwireguard-apple.git

macOS: Use tunnelOverheadBytes for automatic MTU in macOS

Signed-off-by: Roopesh Chander <roop@roopc.net>
---

diff --git a/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift b/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift
index f6eb722..a1f90f1 100644
--- a/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift
+++ b/WireGuard/WireGuardNetworkExtension/PacketTunnelSettingsGenerator.swift
@@ -70,7 +70,7 @@ class PacketTunnelSettingsGenerator {
         dnsSettings.matchDomains = [""] // All DNS queries must first go through the tunnel's DNS
         networkSettings.dnsSettings = dnsSettings
 
-        var mtu = tunnelConfiguration.interface.mtu ?? 0
+        let mtu = tunnelConfiguration.interface.mtu ?? 0
 
         /* 0 means automatic MTU. In theory, we should just do
          * `networkSettings.tunnelOverheadBytes = 80` but in
@@ -79,11 +79,15 @@ class PacketTunnelSettingsGenerator {
          * add a nob, maybe, or iOS will do probing for us.
          */
         if mtu == 0 {
-            mtu = 1280
+            #if os(iOS)
+            networkSettings.mtu = NSNumber(value: 1280)
+            #elseif os(OSX)
+            networkSettings.tunnelOverheadBytes = 80
+            #endif
+        } else {
+            networkSettings.mtu = NSNumber(value: mtu)
         }
 
-        networkSettings.mtu = NSNumber(value: mtu)
-
         let (ipv4Routes, ipv6Routes) = routes()
         let (ipv4IncludedRoutes, ipv6IncludedRoutes) = includedRoutes()