From c599bf9497e4180231fc7846193d26f3ed9de349 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Tue, 5 Feb 2019 22:06:25 +0900
Subject: [PATCH] Fix up errors and paths

---
 main_windows.go    |  7 ++++---
 tun/tun_windows.go | 14 +++++++-------
 version.go         |  1 +
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/main_windows.go b/main_windows.go
index f6a0b88..d3cd82b 100644
--- a/main_windows.go
+++ b/main_windows.go
@@ -7,9 +7,10 @@ package main
 
 import (
 	"fmt"
-	"git.zx2c4.com/wireguard-go/tun"
 	"os"
 	"os/signal"
+
+	"git.zx2c4.com/wireguard-go/tun"
 )
 
 const (
@@ -18,8 +19,7 @@ const (
 )
 
 func main() {
-
-	if len(os.Args) != 1 {
+	if len(os.Args) != 2 {
 		os.Exit(ExitSetupFailed)
 	}
 	//configFile := os.Args[1]
@@ -44,6 +44,7 @@ func main() {
 	}
 
 	device := NewDevice(tun, logger)
+	device.Up()
 	logger.Info.Println("Device started")
 
 	uapi, err := UAPIListen(interfaceName)
diff --git a/tun/tun_windows.go b/tun/tun_windows.go
index 19a9d2d..a9b29d2 100644
--- a/tun/tun_windows.go
+++ b/tun/tun_windows.go
@@ -53,7 +53,7 @@ type nativeTun struct {
 }
 
 func CreateTUN(ifname string) (TUNDevice, error) {
-	signalNameUTF16, err := windows.UTF16PtrFromString(fmt.Sprintf("Global\\TUN_EVENT_%s", ifname))
+	signalNameUTF16, err := windows.UTF16PtrFromString(fmt.Sprintf("Global\\WINTUN_EVENT_%s", ifname))
 	if err != nil {
 		return nil, err
 	}
@@ -61,7 +61,7 @@ func CreateTUN(ifname string) (TUNDevice, error) {
 	// Create instance.
 	tun := &nativeTun{
 		ifname:     ifname,
-		tunName:    fmt.Sprintf("\\\\.\\Global\\TUN_%s_DEVICE", ifname),
+		tunName:    fmt.Sprintf("\\\\.\\Global\\WINTUN_DEVICE_%s", ifname),
 		signalName: signalNameUTF16,
 		events:     make(chan TUNEvent, 10),
 		errors:     make(chan error, 1),
@@ -90,7 +90,7 @@ func (tun *nativeTun) openTUN() error {
 			case windows.WAIT_TIMEOUT:
 				continue
 			default:
-				return fmt.Errorf("unexpected result from WaitForSingleObject:", e)
+				return errors.New("Unexpected result from WaitForSingleObject: " + e.Error())
 			}
 		}
 
@@ -98,7 +98,7 @@ func (tun *nativeTun) openTUN() error {
 		event, err := windows.OpenEvent(windows.SYNCHRONIZE, false, tun.signalName)
 		if err != nil {
 			file.Close()
-			return fmt.Errorf("opening interface data ready event failed:", err)
+			return errors.New("Opening interface data ready event failed: " + err.Error())
 		}
 
 		tun.tunFile = file
@@ -198,7 +198,7 @@ func (tun *nativeTun) Read(buff []byte, offset int) (int, error) {
 				// Buffer was not full. Wait for the interface data or user close.
 				r, err := windows.WaitForMultipleObjects(tun.signals[:], false, windows.INFINITE)
 				if err != nil {
-					return 0, fmt.Errorf("waiting for data failed:", err)
+					return 0, errors.New("Waiting for data failed: " + err.Error())
 				}
 				switch r {
 				case windows.WAIT_OBJECT_0 + TUN_SIGNAL_DATA_AVAIL:
@@ -250,10 +250,10 @@ func (tun *nativeTun) flush() error {
 func (tun *nativeTun) putTunPacket(buff []byte) error {
 	size := len(buff)
 	if size == 0 {
-		return errors.New("empty packet")
+		return errors.New("Empty packet")
 	}
 	if size > TUN_MAX_PACKET_SIZE {
-		return errors.New("packet too big")
+		return errors.New("Packet too big")
 	}
 
 	if tun.wrBuff.numPackets >= TUN_MAX_PACKET_EXCHANGE {
diff --git a/version.go b/version.go
index 415bf57..c731736 100644
--- a/version.go
+++ b/version.go
@@ -1,2 +1,3 @@
 package main
+
 const WireGuardGoVersion = "0.0.20181222"