Add back addresses.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

8 files changed, 94 insertions, 30 deletions

diff --git a/Shared/ProviderConfigurationKeys.swift b/Shared/ProviderConfigurationKeys.swift
new file mode 100644
index 0000000..401cafe
--- /dev/null
+++ b/Shared/ProviderConfigurationKeys.swift
@@ -0,0 +1,13 @@
+//
+//  ProviderConfigurationKeys.swift
+//  WireGuard
+//
+//  Created by Jeroen Leenarts on 12-08-18.
+//  Copyright © 2018 WireGuard. All rights reserved.
+//
+
+import Foundation
+
+enum PCKeys: String {
+    case title, tunnelIdentifier, endpoints, dns, addresses, mtu, settings
+}
diff --git a/WireGuard.xcodeproj/project.pbxproj b/WireGuard.xcodeproj/project.pbxproj
index d01f8c5..37cb3ca 100644
--- a/WireGuard.xcodeproj/project.pbxproj
+++ b/WireGuard.xcodeproj/project.pbxproj
@@ -27,10 +27,12 @@
 		4A4BAD2120B6026900F12B28 /* Peer+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD1D20B6026900F12B28 /* Peer+CoreDataClass.swift */; };
 		4A4BAD2220B6026900F12B28 /* Interface+CoreDataProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD1E20B6026900F12B28 /* Interface+CoreDataProperties.swift */; };
 		4A4BAD2320B6026900F12B28 /* Interface+CoreDataClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A4BAD1F20B6026900F12B28 /* Interface+CoreDataClass.swift */; };
-		4A61D82920D98CE2006C7A76 /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A61D82820D98CE2006C7A76 /* PacketTunnelProvider.swift */; };
 		4A61D82E20D98CE2006C7A76 /* WireGuardNetworkExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 4A61D82620D98CE1006C7A76 /* WireGuardNetworkExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
 		4A61D83520D98D25006C7A76 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A61D83420D98D25006C7A76 /* NetworkExtension.framework */; };
 		4A8AABD820B6A79100B6D8C1 /* UITableView+WireGuard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A8AABD720B6A79100B6D8C1 /* UITableView+WireGuard.swift */; };
+		4AC086832120B9F900CEE5ED /* ProviderConfigurationKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AC086822120B9F900CEE5ED /* ProviderConfigurationKeys.swift */; };
+		4AC086852120BCB500CEE5ED /* ProviderConfigurationKeys.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AC086822120B9F900CEE5ED /* ProviderConfigurationKeys.swift */; };
+		4AC086862120BD5800CEE5ED /* PacketTunnelProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A61D82820D98CE2006C7A76 /* PacketTunnelProvider.swift */; };
 		4AC5462E2116306F00749D21 /* Tunnel+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4AC5462D2116306F00749D21 /* Tunnel+Extension.swift */; };
 		4AC5462F211643DE00749D21 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A61D83420D98D25006C7A76 /* NetworkExtension.framework */; };
 		4AD095C820DC4190000E9CF5 /* libwg-go.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4AD0900120DC4171000E9CF5 /* libwg-go.a */; };
@@ -103,6 +105,7 @@
 		4A61D83320D98D07006C7A76 /* WireGuard.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = WireGuard.entitlements; sourceTree = "<group>"; };
 		4A61D83420D98D25006C7A76 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; };
 		4A8AABD720B6A79100B6D8C1 /* UITableView+WireGuard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UITableView+WireGuard.swift"; sourceTree = "<group>"; };
+		4AC086822120B9F900CEE5ED /* ProviderConfigurationKeys.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ProviderConfigurationKeys.swift; sourceTree = "<group>"; };
 		4AC5462D2116306F00749D21 /* Tunnel+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Tunnel+Extension.swift"; sourceTree = "<group>"; };
 		4AD0900120DC4171000E9CF5 /* libwg-go.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "libwg-go.a"; sourceTree = "<group>"; };
 		4AD0900720DC4171000E9CF5 /* wireguard.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = wireguard.h; sourceTree = "<group>"; };
@@ -146,6 +149,7 @@
 		4A4BACD920B5F1BF00F12B28 = {
 			isa = PBXGroup;
 			children = (
+				4AC086812120B9E600CEE5ED /* Shared */,
 				4AD08FFE20DC4171000E9CF5 /* wireguard-go-bridge */,
 				4A4BAD0720B5F4BC00F12B28 /* Resources */,
 				4A4BACE420B5F1BF00F12B28 /* WireGuard */,
@@ -251,6 +255,14 @@
 			path = WireGuardNetworkExtension;
 			sourceTree = "<group>";
 		};
+		4AC086812120B9E600CEE5ED /* Shared */ = {
+			isa = PBXGroup;
+			children = (
+				4AC086822120B9F900CEE5ED /* ProviderConfigurationKeys.swift */,
+			);
+			path = Shared;
+			sourceTree = "<group>";
+		};
 		4AD08FFE20DC4171000E9CF5 /* wireguard-go-bridge */ = {
 			isa = PBXGroup;
 			children = (
@@ -533,6 +545,7 @@
 				4A4BA6D820B73CBA00223AB8 /* TunnelConfigurationTableViewController.swift in Sources */,
 				4A4BAD2020B6026900F12B28 /* Peer+CoreDataProperties.swift in Sources */,
 				4A4BAD2320B6026900F12B28 /* Interface+CoreDataClass.swift in Sources */,
+				4AC086832120B9F900CEE5ED /* ProviderConfigurationKeys.swift in Sources */,
 				4A8AABD820B6A79100B6D8C1 /* UITableView+WireGuard.swift in Sources */,
 				4A4BAD2120B6026900F12B28 /* Peer+CoreDataClass.swift in Sources */,
 				4A4BAD1B20B5F8FF00F12B28 /* Tunnel+CoreDataProperties.swift in Sources */,
@@ -553,7 +566,8 @@
 			buildActionMask = 2147483647;
 			files = (
 				4AD095CC20DC42CD000E9CF5 /* WireGuardGoWrapper.m in Sources */,
-				4A61D82920D98CE2006C7A76 /* PacketTunnelProvider.swift in Sources */,
+				4AC086852120BCB500CEE5ED /* ProviderConfigurationKeys.swift in Sources */,
+				4AC086862120BD5800CEE5ED /* PacketTunnelProvider.swift in Sources */,
 				4AEAC32920F14B3B007B67AB /* Log.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
diff --git a/WireGuard/Base.lproj/Main.storyboard b/WireGuard/Base.lproj/Main.storyboard
index 1b486a8..013b7b3 100644
--- a/WireGuard/Base.lproj/Main.storyboard
+++ b/WireGuard/Base.lproj/Main.storyboard
@@ -87,24 +87,24 @@
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                         <prototypes>
-                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InterfaceTableViewCell" rowHeight="308" id="06N-KU-LSv" customClass="InterfaceTableViewCell" customModule="WireGuard" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="28" width="375" height="308"/>
+                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="InterfaceTableViewCell" rowHeight="400" id="06N-KU-LSv" customClass="InterfaceTableViewCell" customModule="WireGuard" customModuleProvider="target">
+                                <rect key="frame" x="0.0" y="28" width="375" height="400"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="06N-KU-LSv" id="CSX-Am-ix0">
-                                    <rect key="frame" x="0.0" y="0.0" width="375" height="307.5"/>
+                                    <rect key="frame" x="0.0" y="0.0" width="375" height="399.5"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="14" translatesAutoresizingMaskIntoConstraints="NO" id="DIe-hK-tf6">
-                                            <rect key="frame" x="16" y="11" width="343" height="286"/>
+                                            <rect key="frame" x="16" y="11" width="343" height="378"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Interface" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uku-6H-QWf">
-                                                    <rect key="frame" x="0.0" y="0.0" width="343" height="46"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="343" height="51.5"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="uLA-3S-jCk">
-                                                    <rect key="frame" x="0.0" y="60" width="343" height="46"/>
+                                                    <rect key="frame" x="0.0" y="65.5" width="343" height="51"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Name" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uJE-LK-T3Y">
                                                             <rect key="frame" x="0.0" y="0.0" width="343" height="16"/>
@@ -113,7 +113,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6y9-eJ-8fF">
-                                                            <rect key="frame" x="0.0" y="16" width="343" height="30"/>
+                                                            <rect key="frame" x="0.0" y="16" width="343" height="35"/>
                                                             <nil key="textColor"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <textInputTraits key="textInputTraits"/>
@@ -125,7 +125,7 @@
                                                     </subviews>
                                                 </stackView>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="wwN-OL-XUr">
-                                                    <rect key="frame" x="0.0" y="120" width="343" height="46"/>
+                                                    <rect key="frame" x="0.0" y="130.5" width="343" height="51.5"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Private key" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fMQ-kK-FD5">
                                                             <rect key="frame" x="0.0" y="0.0" width="343" height="16"/>
@@ -134,10 +134,10 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="26U-vy-7Lc">
-                                                            <rect key="frame" x="0.0" y="16" width="343" height="30"/>
+                                                            <rect key="frame" x="0.0" y="16" width="343" height="35.5"/>
                                                             <subviews>
                                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="hYd-0L-nnY">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="232" height="30"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="232" height="35.5"/>
                                                                     <nil key="textColor"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <textInputTraits key="textInputTraits"/>
@@ -147,7 +147,7 @@
                                                                     </connections>
                                                                 </textField>
                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="C1M-bh-5mf">
-                                                                    <rect key="frame" x="240" y="0.0" width="103" height="30"/>
+                                                                    <rect key="frame" x="240" y="0.0" width="103" height="35.5"/>
                                                                     <state key="normal" title="Generate"/>
                                                                 </button>
                                                             </subviews>
@@ -155,7 +155,7 @@
                                                     </subviews>
                                                 </stackView>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="nv7-4q-QjM">
-                                                    <rect key="frame" x="0.0" y="180" width="343" height="46"/>
+                                                    <rect key="frame" x="0.0" y="196" width="343" height="51.5"/>
                                                     <subviews>
                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Listen port" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="h1p-Ea-ler">
                                                             <rect key="frame" x="0.0" y="0.0" width="343" height="16"/>
@@ -164,7 +164,7 @@
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                         <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="(random)" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="CSv-At-WVr">
-                                                            <rect key="frame" x="0.0" y="16" width="343" height="30"/>
+                                                            <rect key="frame" x="0.0" y="16" width="343" height="35.5"/>
                                                             <nil key="textColor"/>
                                                             <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                             <textInputTraits key="textInputTraits"/>
@@ -175,11 +175,32 @@
                                                         </textField>
                                                     </subviews>
                                                 </stackView>
+                                                <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="PJF-32-WyF">
+                                                    <rect key="frame" x="0.0" y="261.5" width="343" height="51"/>
+                                                    <subviews>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Addresses" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="L6l-5D-oKQ">
+                                                            <rect key="frame" x="0.0" y="0.0" width="343" height="16"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="13"/>
+                                                            <color key="textColor" red="0.60784313729999995" green="0.60784313729999995" blue="0.60784313729999995" alpha="1" colorSpace="calibratedRGB"/>
+                                                            <nil key="highlightedColor"/>
+                                                        </label>
+                                                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oOY-vP-nYT">
+                                                            <rect key="frame" x="0.0" y="16" width="343" height="35"/>
+                                                            <nil key="textColor"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                            <textInputTraits key="textInputTraits"/>
+                                                            <connections>
+                                                                <action selector="textfieldDidChange:" destination="06N-KU-LSv" eventType="editingChanged" id="HAL-o6-G7A"/>
+                                                                <outlet property="delegate" destination="06N-KU-LSv" id="M1a-B6-Cl2"/>
+                                                            </connections>
+                                                        </textField>
+                                                    </subviews>
+                                                </stackView>
                                                 <stackView opaque="NO" contentMode="scaleToFill" spacing="8" translatesAutoresizingMaskIntoConstraints="NO" id="7fC-XV-6KP">
-                                                    <rect key="frame" x="0.0" y="240" width="343" height="46"/>
+                                                    <rect key="frame" x="0.0" y="326.5" width="343" height="51.5"/>
                                                     <subviews>
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="NR3-Me-yLc">
-                                                            <rect key="frame" x="0.0" y="0.0" width="232" height="46"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="232" height="51.5"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DNS servers" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="SA3-N0-wfi">
                                                                     <rect key="frame" x="0.0" y="0.0" width="232" height="16"/>
@@ -188,7 +209,7 @@
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ByK-wW-6Q4">
-                                                                    <rect key="frame" x="0.0" y="16" width="232" height="30"/>
+                                                                    <rect key="frame" x="0.0" y="16" width="232" height="35.5"/>
                                                                     <nil key="textColor"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <textInputTraits key="textInputTraits"/>
@@ -200,7 +221,7 @@
                                                             </subviews>
                                                         </stackView>
                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="UId-O4-q3t">
-                                                            <rect key="frame" x="240" y="0.0" width="103" height="46"/>
+                                                            <rect key="frame" x="240" y="0.0" width="103" height="51.5"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="MTU" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="vYu-BI-0Gj">
                                                                     <rect key="frame" x="0.0" y="0.0" width="103" height="16"/>
@@ -209,7 +230,7 @@
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                                 <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="(auto)" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="myM-B2-sjT">
-                                                                    <rect key="frame" x="0.0" y="16" width="103" height="30"/>
+                                                                    <rect key="frame" x="0.0" y="16" width="103" height="35.5"/>
                                                                     <nil key="textColor"/>
                                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                     <textInputTraits key="textInputTraits"/>
@@ -237,6 +258,7 @@
                                     </constraints>
                                 </tableViewCellContentView>
                                 <connections>
+                                    <outlet property="addressesField" destination="oOY-vP-nYT" id="qcc-pN-5ug"/>
                                     <outlet property="dnsField" destination="ByK-wW-6Q4" id="gZ4-7d-AHM"/>
                                     <outlet property="listenPortField" destination="CSv-At-WVr" id="xnx-xz-pqS"/>
                                     <outlet property="mtuField" destination="myM-B2-sjT" id="ppo-pV-tMl"/>
@@ -245,7 +267,7 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="AddPeerTableViewCell" rowHeight="60" id="RyR-s5-lBV" customClass="AddPeerTableViewCell" customModule="WireGuard" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="336" width="375" height="60"/>
+                                <rect key="frame" x="0.0" y="428" width="375" height="60"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="RyR-s5-lBV" id="gPY-qW-fbd">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="59.5"/>
@@ -270,7 +292,7 @@
                                 </tableViewCellContentView>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="PeerTableViewCell" rowHeight="308" id="gzz-88-0IG" customClass="PeerTableViewCell" customModule="WireGuard" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="396" width="375" height="308"/>
+                                <rect key="frame" x="0.0" y="488" width="375" height="308"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="gzz-88-0IG" id="XA6-EM-5V9">
                                     <rect key="frame" x="0.0" y="0.0" width="375" height="307.5"/>
diff --git a/WireGuard/Models/Interface+CoreDataProperties.swift b/WireGuard/Models/Interface+CoreDataProperties.swift
index 7c426b1..d52901f 100644
--- a/WireGuard/Models/Interface+CoreDataProperties.swift
+++ b/WireGuard/Models/Interface+CoreDataProperties.swift
@@ -16,6 +16,7 @@ extension Interface {
         return NSFetchRequest<Interface>(entityName: "Interface")
     }
 
+    @NSManaged public var addresses: String?
     @NSManaged public var listenPort: Int16
     @NSManaged public var privateKey: String?
     @NSManaged public var mtu: Int32
diff --git a/WireGuard/Models/Tunnel+Extension.swift b/WireGuard/Models/Tunnel+Extension.swift
index cd1f015..6d50fb2 100644
--- a/WireGuard/Models/Tunnel+Extension.swift
+++ b/WireGuard/Models/Tunnel+Extension.swift
@@ -12,8 +12,15 @@ extension Tunnel {
     public func generateProviderConfiguration() -> [String: Any] {
         var providerConfiguration = [String: Any]()
 
-        providerConfiguration["title"] = self.title
-        providerConfiguration["tunnelIdentifier"] = self.tunnelIdentifier
+        providerConfiguration[PCKeys.title.rawValue] = self.title
+        providerConfiguration[PCKeys.tunnelIdentifier.rawValue] = self.tunnelIdentifier
+        providerConfiguration[PCKeys.endpoints.rawValue] = peers?.array.compactMap {($0 as? Peer)?.endpoint}.joined(separator: ", ")
+        providerConfiguration[PCKeys.dns.rawValue] = interface?.dns
+        providerConfiguration[PCKeys.addresses.rawValue] = interface?.addresses
+        if let mtu = interface?.mtu {
+            providerConfiguration[PCKeys.mtu.rawValue] = NSNumber(value: mtu)
+        }
+
         var settingsString = "replace_peers=true\n"
         if let interface = interface {
             settingsString += generateInterfaceProviderConfiguration(interface)
@@ -40,9 +47,6 @@ extension Tunnel {
         if interface.listenPort > 0 {
             settingsString += "listen_port=\(interface.listenPort)\n"
         }
-        if let dns = interface.dns {
-            settingsString += "dns=\(dns)\n"
-        }
         if interface.mtu > 0 {
             settingsString += "mtu=\(interface.mtu)\n"
         }
diff --git a/WireGuard/Models/WireGuard.xcdatamodeld/WireGuard.xcdatamodel/contents b/WireGuard/Models/WireGuard.xcdatamodeld/WireGuard.xcdatamodel/contents
index d888fa1..398ed39 100644
--- a/WireGuard/Models/WireGuard.xcdatamodeld/WireGuard.xcdatamodel/contents
+++ b/WireGuard/Models/WireGuard.xcdatamodeld/WireGuard.xcdatamodel/contents
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="14135" systemVersion="17G65" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="Interface" representedClassName="Interface" syncable="YES">
+        <attribute name="addresses" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="dns" optional="YES" attributeType="String" syncable="YES"/>
         <attribute name="listenPort" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
         <attribute name="mtu" optional="YES" attributeType="Integer 32" defaultValueString="0" usesScalarValueType="YES" syncable="YES"/>
@@ -22,7 +23,7 @@
         <relationship name="peers" toMany="YES" deletionRule="Cascade" ordered="YES" destinationEntity="Peer" inverseName="tunnel" inverseEntity="Peer" syncable="YES"/>
     </entity>
     <elements>
-        <element name="Interface" positionX="-54" positionY="-9" width="128" height="120"/>
+        <element name="Interface" positionX="-54" positionY="-9" width="128" height="135"/>
         <element name="Peer" positionX="-36" positionY="9" width="128" height="135"/>
         <element name="Tunnel" positionX="160" positionY="192" width="128" height="105"/>
     </elements>
diff --git a/WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift b/WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift
index f761495..85d3581 100644
--- a/WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift
+++ b/WireGuard/ViewControllers/TunnelConfigurationTableViewController.swift
@@ -137,6 +137,7 @@ class InterfaceTableViewCell: UITableViewCell {
     var model: Interface! {
         didSet {
             nameField.text = model.tunnel?.title
+            addressesField.text = model.addresses
             privateKeyField.text = model.privateKey
             listenPortField.text = String(model.listenPort)
             dnsField.text = model.dns
@@ -145,6 +146,7 @@ class InterfaceTableViewCell: UITableViewCell {
     }
 
     @IBOutlet weak var nameField: UITextField!
+    @IBOutlet weak var addressesField: UITextField!
     @IBOutlet weak var privateKeyField: UITextField!
     @IBOutlet weak var publicKeyField: UITextField!
     @IBOutlet weak var listenPortField: UITextField!
@@ -161,6 +163,8 @@ extension InterfaceTableViewCell: UITextFieldDelegate {
             model.tunnel?.title = string
         } else if sender == privateKeyField {
             model.privateKey = string
+        } else if sender == addressesField {
+            model.addresses = string
         } else if sender == listenPortField {
             if let string = string, let port = Int16(string) {
                 model.listenPort = port
diff --git a/WireGuardNetworkExtension/PacketTunnelProvider.swift b/WireGuardNetworkExtension/PacketTunnelProvider.swift
index a6891fa..3443e98 100644
--- a/WireGuardNetworkExtension/PacketTunnelProvider.swift
+++ b/WireGuardNetworkExtension/PacketTunnelProvider.swift
@@ -28,8 +28,13 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
         os_log("Starting tunnel", log: Log.general, type: .info)
 
         let config = self.protocolConfiguration as! NETunnelProviderProtocol // swiftlint:disable:this force_cast
-        let interfaceName = config.providerConfiguration!["title"]! as! String // swiftlint:disable:this force_cast
-        let settings = config.providerConfiguration!["settings"]! as! String // swiftlint:disable:this force_cast
+        let interfaceName = config.providerConfiguration![PCKeys.title.rawValue]! as! String // swiftlint:disable:this force_cast
+        let mtu = config.providerConfiguration![PCKeys.mtu.rawValue] as? NSNumber
+        let settings = config.providerConfiguration![PCKeys.settings.rawValue]! as! String // swiftlint:disable:this force_cast
+        let endpoints = config.providerConfiguration?[PCKeys.endpoints.rawValue] as? String ?? ""
+        let addresses = (config.providerConfiguration?[PCKeys.addresses.rawValue] as? String ?? "").split(separator: ",")
+
+        settings.split(separator: "\n").forEach {os_log("Tunnel config: %{public}s", log: Log.general, type: .info, String($0))}
 
         if wireGuardWrapper.turnOn(withInterfaceName: interfaceName, settingsString: settings) {
             // Success