From 84d3ab740d0637a88537e54110b8a6486c3bd118 Mon Sep 17 00:00:00 2001 From: jwijenbergh Date: Thu, 22 Feb 2024 16:03:28 +0100 Subject: Client + Exports: Update to latest proxyguard API - Add a ClientProxyReady callback - do a DNS request for the IPs --- client/proxy.go | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'client') diff --git a/client/proxy.go b/client/proxy.go index 349a080..31a17a6 100644 --- a/client/proxy.go +++ b/client/proxy.go @@ -1,6 +1,9 @@ package client import ( + "net" + "net/url" + "codeberg.org/eduVPN/proxyguard" "github.com/eduvpn/eduvpn-common/i18nerr" "github.com/eduvpn/eduvpn-common/internal/log" @@ -21,11 +24,23 @@ func (pl *ProxyLogger) Log(msg string) { } // StartProxyguard starts proxyguard for proxied WireGuard connections -func (c *Client) StartProxyguard(ck *cookie.Cookie, listen string, tcpsp int, peer string, gotFD func(fd int)) error { +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 - err = proxyguard.Client(ck.Context(), listen, tcpsp, peer, -1) + proxyguard.ClientProxyReady = ready + + u, err := url.Parse(peer) + if err != nil { + return i18nerr.Wrap(err, "The peer is not a valid URL") + } + + pips, err := net.DefaultResolver.LookupHost(ck.Context(), u.Host) + if err != nil { + return i18nerr.Wrapf(err, "Cannot lookup peer host: '%s'", u.Host) + } + + err = proxyguard.Client(ck.Context(), listen, tcpsp, peer, pips, -1) if err != nil { return i18nerr.Wrap(err, "The VPN proxy exited") } -- cgit v1.2.3