diff options
| -rw-r--r-- | client/proxy.go | 16 | ||||
| -rw-r--r-- | go.mod | 2 | ||||
| -rw-r--r-- | go.sum | 2 |
3 files changed, 5 insertions, 15 deletions
diff --git a/client/proxy.go b/client/proxy.go index 721dcac..c008f56 100644 --- a/client/proxy.go +++ b/client/proxy.go @@ -1,9 +1,6 @@ package client import ( - "net" - "net/url" - "codeberg.org/eduVPN/proxyguard" "github.com/eduvpn/eduvpn-common/i18nerr" "github.com/eduvpn/eduvpn-common/internal/log" @@ -39,17 +36,8 @@ func (c *Client) StartProxyguard(ck *cookie.Cookie, listen string, tcpsp int, pe 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) + // 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) if err != nil { return i18nerr.Wrap(err, "The VPN proxy exited") } @@ -3,7 +3,7 @@ module github.com/eduvpn/eduvpn-common go 1.18 require ( - codeberg.org/eduVPN/proxyguard v0.0.0-20240222150137-7a64d5af6bd2 + codeberg.org/eduVPN/proxyguard v0.0.0-20240223093313-0b7963ba28b9 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 @@ -2,6 +2,8 @@ codeberg.org/eduVPN/proxyguard v0.0.0-20240213150724-adfa5487640a h1:OH5xfNALCNH codeberg.org/eduVPN/proxyguard v0.0.0-20240213150724-adfa5487640a/go.mod h1:fc7DsdgdLmrO7DN45HNp+ekVewlRcikSOkAvUeGUvWk= codeberg.org/eduVPN/proxyguard v0.0.0-20240222150137-7a64d5af6bd2 h1:Vm4JtbNHY/W11ldulDK6rGw56vvQilv42pZ/jSWlIlc= 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= 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= |