Client: Update to latest proxyguard API

3 files changed, 18 insertions, 13 deletions

diff --git a/client/proxy.go b/client/proxy.go
index c008f56..60bf980 100644
--- a/client/proxy.go
+++ b/client/proxy.go
@@ -24,20 +24,21 @@ func (pl *ProxyLogger) Log(msg string) {
 func (c *Client) StartProxyguard(ck *cookie.Cookie, listen string, tcpsp int, peer string, gotFD func(fd int), ready func()) error {
 	var err error
 	proxyguard.UpdateLogger(&ProxyLogger{})
-	proxyguard.GotClientFD = gotFD
-	proxyguard.ClientProxyReady = func() {
-		// already connected
-		// no need to signal to the client that the proxy is ready
-		if c.InState(StateConnected) {
-			log.Logger.Debugf("proxyguard is ready again when the client was already connected")
-			return
-		}
-		log.Logger.Debugf("forwarding proxyguard ready callback to client")
-		ready()
+
+	proxyc := proxyguard.Client{
+		Listen: listen,
+		TCPSourcePort: tcpsp,
+		SetupSocket: func(fd int, _ []string) {
+			if gotFD != nil {
+				gotFD(fd)
+			}
+			// TODO: support peerips
+		},
+		Ready: ready,
 	}
 
 	// we set peer IPs to nil here as proxyguard already does a DNS request for us
-	err = proxyguard.Client(ck.Context(), listen, tcpsp, peer, nil, -1)
+	err = proxyc.Tunnel(ck.Context(), peer, nil)
 	if err != nil {
 		return i18nerr.Wrap(err, "The VPN proxy exited")
 	}
diff --git a/go.mod b/go.mod
index 4d02f39..742e464 100644
--- a/go.mod
+++ b/go.mod
@@ -3,7 +3,7 @@ module github.com/eduvpn/eduvpn-common
 go 1.18
 
 require (
-	codeberg.org/eduVPN/proxyguard v0.0.0-20240223093313-0b7963ba28b9
+	codeberg.org/eduVPN/proxyguard v0.0.0-20240227141358-a9550f2beb55
 	github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267
 	github.com/jwijenbergh/eduoauth-go v0.0.0-20240212102633-770ef228bd93
 	github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c
@@ -17,7 +17,7 @@ require (
 )
 
 require (
-	golang.org/x/crypto v0.19.0 // indirect
+	golang.org/x/crypto v0.20.0 // indirect
 	golang.org/x/net v0.21.0
 	golang.org/x/sys v0.17.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 2778558..4aa1301 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,8 @@ codeberg.org/eduVPN/proxyguard v0.0.0-20240222150137-7a64d5af6bd2 h1:Vm4JtbNHY/W
 codeberg.org/eduVPN/proxyguard v0.0.0-20240222150137-7a64d5af6bd2/go.mod h1:fc7DsdgdLmrO7DN45HNp+ekVewlRcikSOkAvUeGUvWk=
 codeberg.org/eduVPN/proxyguard v0.0.0-20240223093313-0b7963ba28b9 h1:rxCDQzVDiZXfzmOoPitZHus2X9uO9fgs4HmQoJfRerw=
 codeberg.org/eduVPN/proxyguard v0.0.0-20240223093313-0b7963ba28b9/go.mod h1:fc7DsdgdLmrO7DN45HNp+ekVewlRcikSOkAvUeGUvWk=
+codeberg.org/eduVPN/proxyguard v0.0.0-20240227141358-a9550f2beb55 h1:1tRF8Oqqiwc49P5oQBWgh+dsXtrtbaR3om64RdxaeGc=
+codeberg.org/eduVPN/proxyguard v0.0.0-20240227141358-a9550f2beb55/go.mod h1:fc7DsdgdLmrO7DN45HNp+ekVewlRcikSOkAvUeGUvWk=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267 h1:TMtDYDHKYY15rFihtRfck/bfFqNfvcabqvXAFQfAUpY=
 github.com/jedisct1/go-minisign v0.0.0-20230811132847-661be99b8267/go.mod h1:h1nSAbGFqGVzn6Jyl1R/iCcBUHN4g+gW1u9CoBTrb9E=
@@ -13,6 +15,8 @@ github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmd
 github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
 golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo=
 golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.20.0 h1:jmAMJJZXr5KiCw05dfYK9QnqaqKLYXijU23lsEdcQqg=
+golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ=
 golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
 golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=