Changeset 732 in code for trunk/user.go

Timestamp:

Dec 2, 2021, 9:53:43 AM (4 years ago)

Author:

contact

Message:

Add context to connectToUpstream

File:

• trunk/user.go (modified) (3 diffs)

trunk/user.go

@@ -203 +203 @@
                 lastTry = time.Now()
 
-                uc, err := connectToUpstream(net)
+                uc, err := connectToUpstream(context.TODO(), net)
                 if err != nil {
                         net.logger.Printf("failed to connect to upstream server %q: %v", net.Addr, err)
@@ -1016 +1016 @@
 // localAddrForHost returns the local address to use when connecting to host.
 // A nil address is returned when the OS should automatically pick one.
-func (u *user) localTCPAddrForHost(host string) (*net.TCPAddr, error) {
+func (u *user) localTCPAddrForHost(ctx context.Context, host string) (*net.TCPAddr, error) {
         upstreamUserIPs := u.srv.Config().UpstreamUserIPs
         if len(upstreamUserIPs) == 0 {
@@ -1022 +1022 @@
         }
 
-        ips, err := net.LookupIP(host)
+        ips, err := net.DefaultResolver.LookupIP(ctx, "ip", host)
         if err != nil {
                 return nil, err