From 79eb071e6a661b9b3df14df9791558eb03c4c8b9 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 3 Mar 2019 01:59:14 +0100
Subject: callbacks: use cb as receiver for unregister

---
 service/ipc_client.go     | 4 ++--
 service/service_tunnel.go | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'service')

diff --git a/service/ipc_client.go b/service/ipc_client.go
index 6834e10e..adaca0b7 100644
--- a/service/ipc_client.go
+++ b/service/ipc_client.go
@@ -134,7 +134,7 @@ func IPCClientRegisterTunnelChange(cb func(tunnel *Tunnel, state TunnelState)) *
 	tunnelChangeCallbacks[s] = true
 	return s
 }
-func IPCClientUnregisterTunnelChange(cb *TunnelChangeCallback) {
+func (cb *TunnelChangeCallback) Unregister() {
 	delete(tunnelChangeCallbacks, cb)
 }
 func IPCClientRegisterTunnelsChange(cb func()) *TunnelsChangeCallback {
@@ -142,6 +142,6 @@ func IPCClientRegisterTunnelsChange(cb func()) *TunnelsChangeCallback {
 	tunnelsChangeCallbacks[s] = true
 	return s
 }
-func IPCClientUnregisterTunnelsChange(cb *TunnelsChangeCallback) {
+func (cb *TunnelsChangeCallback) Unregister() {
 	delete(tunnelsChangeCallbacks, cb)
 }
diff --git a/service/service_tunnel.go b/service/service_tunnel.go
index 12a0d709..6eff6fa5 100644
--- a/service/service_tunnel.go
+++ b/service/service_tunnel.go
@@ -8,7 +8,6 @@ package service
 import (
 	"bufio"
 	"fmt"
-	"golang.zx2c4.com/winipcfg"
 	"log"
 	"strings"
 
@@ -175,7 +174,7 @@ loop:
 
 	changes <- svc.Status{State: svc.StopPending}
 	logger.Info.Println("Shutting down")
-	winipcfg.UnregisterRouteChangeCallback(routeMonitorCallback)
+	routeMonitorCallback.Unregister()
 	uapi.Close()
 	device.Close()
 	return
-- 
cgit v1.2.3-59-g8ed1b