From: Matt Joiner <anacrolix@gmail.com>
Date: Wed, 15 Dec 2021 22:44:59 +0000 (+1100)
Subject: Fix go-libutp import when CGO is disabled
X-Git-Tag: v1.39.2~2
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=48fa9b59fd8387d2497286943872dd917e0729a5;p=btrtrc.git

Fix go-libutp import when CGO is disabled
---

diff --git a/socket.go b/socket.go
index fbe8d9cb..4de2592a 100644
--- a/socket.go
+++ b/socket.go
@@ -5,7 +5,6 @@ import (
 	"net"
 	"strconv"
 
-	utp "github.com/anacrolix/go-libutp"
 	"github.com/anacrolix/missinggo/perf"
 	"github.com/anacrolix/missinggo/v2"
 	"github.com/pkg/errors"
@@ -101,7 +100,8 @@ func listenAllRetry(nahs []networkAndHost, port int, f firewallCallback) (ss []s
 	return
 }
 
-type firewallCallback = utp.FirewallCallback
+// This isn't aliased from go-libutp since that assumes CGO.
+type firewallCallback func(net.Addr) bool
 
 func listenUtp(network, addr string, fc firewallCallback) (socket, error) {
 	us, err := NewUtpSocket(network, addr, fc)
diff --git a/utp_libutp.go b/utp_libutp.go
index 3cbd01c0..76e530de 100644
--- a/utp_libutp.go
+++ b/utp_libutp.go
@@ -16,7 +16,7 @@ func NewUtpSocket(network, addr string, fc firewallCallback) (utpSocket, error)
 		return s, err
 	}
 	if fc != nil {
-		s.SetSyncFirewallCallback(fc)
+		s.SetSyncFirewallCallback(utp.FirewallCallback(fc))
 	}
 	return s, err
 }