Changeset 732 in code for trunk

Timestamp:

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

Author:

contact

Message:

Add context to connectToUpstream

Location:

trunk

Files:

• upstream.go (modified) (6 diffs)
• user.go (modified) (3 diffs)

trunk/upstream.go

@@ -124 +124 @@
 }
 
-func connectToUpstream(network *network) (*upstreamConn, error) {
+func connectToUpstream(ctx context.Context, network *network) (*upstreamConn, error) {
         logger := &prefixLogger{network.user.logger, fmt.Sprintf("upstream %q: ", network.GetName())}
 
@@ -144 +144 @@
                 }
 
-                dialer.LocalAddr, err = network.user.localTCPAddrForHost(host)
+                dialer.LocalAddr, err = network.user.localTCPAddrForHost(ctx, host)
                 if err != nil {
                         return nil, fmt.Errorf("failed to pick local IP for remote host %q: %v", host, err)
@@ -172 +172 @@
                 }
 
-                netConn, err = dialer.Dial("tcp", addr)
+                netConn, err = dialer.DialContext(ctx, "tcp", addr)
                 if err != nil {
                         return nil, fmt.Errorf("failed to dial %q: %v", addr, err)
@@ -189 +189 @@
                 }
 
-                dialer.LocalAddr, err = network.user.localTCPAddrForHost(host)
+                dialer.LocalAddr, err = network.user.localTCPAddrForHost(ctx, host)
                 if err != nil {
                         return nil, fmt.Errorf("failed to pick local IP for remote host %q: %v", host, err)
@@ -195 +195 @@
 
                 logger.Printf("connecting to plain-text server at address %q", addr)
-                netConn, err = dialer.Dial("tcp", addr)
+                netConn, err = dialer.DialContext(ctx, "tcp", addr)
                 if err != nil {
                         return nil, fmt.Errorf("failed to dial %q: %v", addr, err)
@@ -201 +201 @@
         case "irc+unix", "unix":
                 logger.Printf("connecting to Unix socket at path %q", u.Path)
-                netConn, err = dialer.Dial("unix", u.Path)
+                netConn, err = dialer.DialContext(ctx, "unix", u.Path)
                 if err != nil {
                         return nil, fmt.Errorf("failed to connect to Unix socket %q: %v", u.Path, err)

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