Merge pull request #49 from ipfs/fix/id-hang

close wait channel in all cases, not just success

p2p/protocol/identify/id.go

@@ -72,9 +72,12 @@ func (ids *IDService) IdentifyConn(c inet.Conn) {
 		<-wait // already identifying it. wait for it.
 		return
 	}
-	ids.currid[c] = make(chan struct{})
+	ch := make(chan struct{})
+	ids.currid[c] = ch
 	ids.currmu.Unlock()
 
+	defer close(ch)
+
 	s, err := c.NewStream()
 	if err != nil {
 		log.Debugf("error opening initial stream for %s: %s", ID, err)
@@ -97,16 +100,14 @@ func (ids *IDService) IdentifyConn(c inet.Conn) {
 	ids.ResponseHandler(s)
 
 	ids.currmu.Lock()
-	ch, found := ids.currid[c]
+	_, found := ids.currid[c]
 	delete(ids.currid, c)
 	ids.currmu.Unlock()
 
 	if !found {
 		log.Debugf("IdentifyConn failed to find channel (programmer error) for %s", c)
 		return
 	}
-
-	close(ch) // release everyone waiting.
 }
 
 func (ids *IDService) RequestHandler(s inet.Stream) {