Merge pull request #518 from jbenet/gc-conns

gc closed conns
ipfs · Jan 8, 2015 · b427df3 · b427df3
2 parents 04b938b + 84a2a59
commit b427df3
Show file tree

Hide file tree

Showing 9 changed files with 332 additions and 14 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-peerstream/conn.go b/Godeps/_workspace/src/github.com/jbenet/go-peerstream/conn.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-peerstream/swarm.go b/Godeps/_workspace/src/github.com/jbenet/go-peerstream/swarm.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/muxado/muxado.go b/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/muxado/muxado.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/transport.go b/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/transport.go
diff --git a/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/yamux/yamux.go b/Godeps/_workspace/src/github.com/jbenet/go-peerstream/transport/yamux/yamux.go
diff --git a/p2p/net/conn/secure_conn.go b/p2p/net/conn/secure_conn.go
@@ -58,11 +58,7 @@ func newSecureConn(ctx context.Context, sk ic.PrivKey, insecure Conn) (Conn, err
 }
 
 func (c *secureConn) Close() error {
-	if err := c.secure.Close(); err != nil {
-		c.insecure.Close()
-		return err
-	}
-	return c.insecure.Close()
+	return c.secure.Close()
 }
 
 // ID is an identifier unique to this connection.

diff --git a/p2p/test/reconnects/reconnect.go b/p2p/test/reconnects/reconnect.go
@@ -0,0 +1,2 @@
+// Package reconnect tests connect -> disconnect -> reconnect works
+package reconnect