1 files changed, 62 insertions, 33 deletions

diff --git a/conf/writer.go b/conf/writer.go
index 365e65e9..162962b5 100644
--- a/conf/writer.go
+++ b/conf/writer.go
@@ -1,13 +1,19 @@
 /* SPDX-License-Identifier: MIT
  *
- * Copyright (C) 2019 WireGuard LLC. All Rights Reserved.
+ * Copyright (C) 2019-2022 WireGuard LLC. All Rights Reserved.
  */
 
 package conf
 
 import (
 	"fmt"
+	"net/netip"
 	"strings"
+	"unsafe"
+
+	"golang.org/x/sys/windows"
+	"golang.zx2c4.com/wireguard/windows/driver"
+	"golang.zx2c4.com/wireguard/windows/tunnel/winipcfg"
 )
 
 func (conf *Config) ToWgQuick() string {
@@ -41,6 +47,22 @@ func (conf *Config) ToWgQuick() string {
 		output.WriteString(fmt.Sprintf("MTU = %d\n", conf.Interface.MTU))
 	}
 
+	if len(conf.Interface.PreUp) > 0 {
+		output.WriteString(fmt.Sprintf("PreUp = %s\n", conf.Interface.PreUp))
+	}
+	if len(conf.Interface.PostUp) > 0 {
+		output.WriteString(fmt.Sprintf("PostUp = %s\n", conf.Interface.PostUp))
+	}
+	if len(conf.Interface.PreDown) > 0 {
+		output.WriteString(fmt.Sprintf("PreDown = %s\n", conf.Interface.PreDown))
+	}
+	if len(conf.Interface.PostDown) > 0 {
+		output.WriteString(fmt.Sprintf("PostDown = %s\n", conf.Interface.PostDown))
+	}
+	if conf.Interface.TableOff {
+		output.WriteString("Table = off\n")
+	}
+
 	for _, peer := range conf.Peers {
 		output.WriteString("\n[Peer]\n")
 
@@ -69,43 +91,50 @@ func (conf *Config) ToWgQuick() string {
 	return output.String()
 }
 
-func (conf *Config) ToUAPI() (uapi string, dnsErr error) {
-	var output strings.Builder
-	output.WriteString(fmt.Sprintf("private_key=%s\n", conf.Interface.PrivateKey.HexString()))
-
-	if conf.Interface.ListenPort > 0 {
-		output.WriteString(fmt.Sprintf("listen_port=%d\n", conf.Interface.ListenPort))
+func (config *Config) ToDriverConfiguration() (*driver.Interface, uint32) {
+	preallocation := unsafe.Sizeof(driver.Interface{}) + uintptr(len(config.Peers))*unsafe.Sizeof(driver.Peer{})
+	for i := range config.Peers {
+		preallocation += uintptr(len(config.Peers[i].AllowedIPs)) * unsafe.Sizeof(driver.AllowedIP{})
 	}
-
-	if len(conf.Peers) > 0 {
-		output.WriteString("replace_peers=true\n")
-	}
-
-	for _, peer := range conf.Peers {
-		output.WriteString(fmt.Sprintf("public_key=%s\n", peer.PublicKey.HexString()))
-
-		if !peer.PresharedKey.IsZero() {
-			output.WriteString(fmt.Sprintf("preshared_key=%s\n", peer.PresharedKey.HexString()))
+	var c driver.ConfigBuilder
+	c.Preallocate(uint32(preallocation))
+	c.AppendInterface(&driver.Interface{
+		Flags:      driver.InterfaceHasPrivateKey | driver.InterfaceHasListenPort,
+		ListenPort: config.Interface.ListenPort,
+		PrivateKey: config.Interface.PrivateKey,
+		PeerCount:  uint32(len(config.Peers)),
+	})
+	for i := range config.Peers {
+		flags := driver.PeerHasPublicKey | driver.PeerHasPersistentKeepalive
+		if !config.Peers[i].PresharedKey.IsZero() {
+			flags |= driver.PeerHasPresharedKey
 		}
-
-		if !peer.Endpoint.IsEmpty() {
-			var resolvedIP string
-			resolvedIP, dnsErr = resolveHostname(peer.Endpoint.Host)
-			if dnsErr != nil {
-				return
+		var endpoint winipcfg.RawSockaddrInet
+		if !config.Peers[i].Endpoint.IsEmpty() {
+			addr, err := netip.ParseAddr(config.Peers[i].Endpoint.Host)
+			if err == nil {
+				flags |= driver.PeerHasEndpoint
+				endpoint.SetAddrPort(netip.AddrPortFrom(addr, config.Peers[i].Endpoint.Port))
 			}
-			resolvedEndpoint := Endpoint{resolvedIP, peer.Endpoint.Port}
-			output.WriteString(fmt.Sprintf("endpoint=%s\n", resolvedEndpoint.String()))
 		}
-
-		output.WriteString(fmt.Sprintf("persistent_keepalive_interval=%d\n", peer.PersistentKeepalive))
-
-		if len(peer.AllowedIPs) > 0 {
-			output.WriteString("replace_allowed_ips=true\n")
-			for _, address := range peer.AllowedIPs {
-				output.WriteString(fmt.Sprintf("allowed_ip=%s\n", address.String()))
+		c.AppendPeer(&driver.Peer{
+			Flags:               flags,
+			PublicKey:           config.Peers[i].PublicKey,
+			PresharedKey:        config.Peers[i].PresharedKey,
+			PersistentKeepalive: config.Peers[i].PersistentKeepalive,
+			Endpoint:            endpoint,
+			AllowedIPsCount:     uint32(len(config.Peers[i].AllowedIPs)),
+		})
+		for j := range config.Peers[i].AllowedIPs {
+			a := &driver.AllowedIP{Cidr: uint8(config.Peers[i].AllowedIPs[j].Bits())}
+			copy(a.Address[:], config.Peers[i].AllowedIPs[j].Addr().AsSlice())
+			if config.Peers[i].AllowedIPs[j].Addr().Is4() {
+				a.AddressFamily = windows.AF_INET
+			} else if config.Peers[i].AllowedIPs[j].Addr().Is6() {
+				a.AddressFamily = windows.AF_INET6
 			}
+			c.AppendAllowedIP(a)
 		}
 	}
-	return output.String(), nil
+	return c.Interface()
 }