Merge pull request #135 from multiformats/feat/fix-local-addr

aarshkshah1992 · web-flow · commit 7274874c78df · 2021-01-22T08:14:40.000+05:30
Fix Local Address on TCP connections
diff --git a/net/net.go b/net/net.go
@@ -255,7 +255,15 @@ func (l *maListener) Accept() (Conn, error) {
 		}
 	}
 
-	return wrap(nconn, l.laddr, raddr), nil
+	var laddr ma.Multiaddr
+	if nconn.LocalAddr().String() != "" {
+		laddr, err = FromNetAddr(nconn.LocalAddr())
+		if err != nil {
+			return nil, fmt.Errorf("failed to convert conn.LocalAddr: %s", err)
+		}
+	}
+
+	return wrap(nconn, laddr, raddr), nil
 }
 
 // Multiaddr returns the listener's (local) Multiaddr.

Original file line number	Diff line number	Diff line change
`@@ -255,7 +255,15 @@ func (l *maListener) Accept() (Conn, error) {`
`255`	`255`	`}`
`256`	`256`	`}`
`257`	`257`
`258`		`- return wrap(nconn, l.laddr, raddr), nil`
	`258`	`+ var laddr ma.Multiaddr`
	`259`	`+ if nconn.LocalAddr().String() != "" {`
	`260`	`+ laddr, err = FromNetAddr(nconn.LocalAddr())`
	`261`	`+ if err != nil {`
	`262`	`+ return nil, fmt.Errorf("failed to convert conn.LocalAddr: %s", err)`
	`263`	`+ }`
	`264`	`+ }`
	`265`	`+`
	`266`	`+ return wrap(nconn, laddr, raddr), nil`
`259`	`267`	`}`
`260`	`268`
`261`	`269`	`// Multiaddr returns the listener's (local) Multiaddr.`