From 2b242f93932e1c4ab8b45dd0f628dd4fe063699b Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Thu, 21 Nov 2019 14:48:21 +0100
Subject: wintun: manage ring memory manually

It's large and Go's garbage collector doesn't deal with it especially
well.
---
 tun/tun_windows.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'tun/tun_windows.go')

diff --git a/tun/tun_windows.go b/tun/tun_windows.go
index daad4aa..8fc5174 100644
--- a/tun/tun_windows.go
+++ b/tun/tun_windows.go
@@ -35,11 +35,11 @@ type NativeTun struct {
 	wt        *wintun.Interface
 	handle    windows.Handle
 	close     bool
-	rings     wintun.RingDescriptor
 	events    chan Event
 	errors    chan error
 	forcedMTU int
 	rate      rateJuggler
+	rings     *wintun.RingDescriptor
 }
 
 const WintunPool = wintun.Pool("WireGuard")
@@ -93,13 +93,13 @@ func CreateTUNWithRequestedGUID(ifname string, requestedGUID *windows.GUID, mtu
 		forcedMTU: forcedMTU,
 	}
 
-	err = tun.rings.Init()
+	tun.rings, err = wintun.NewRingDescriptor()
 	if err != nil {
 		tun.Close()
 		return nil, fmt.Errorf("Error creating events: %v", err)
 	}
 
-	tun.handle, err = tun.wt.Register(&tun.rings)
+	tun.handle, err = tun.wt.Register(tun.rings)
 	if err != nil {
 		tun.Close()
 		return nil, fmt.Errorf("Error registering rings: %v", err)
-- 
cgit v1.2.3-59-g8ed1b