Merge pull request #843 from milosgajdos83/dead-code

Clean up dead tunnel code

tunnel/default.go

@@ -919,6 +919,7 @@ func (t *tun) Close() error {
 	default:
 		close(t.closed)
 		t.connected = false
+	}
 
 	// send a close message
 	// we don't close the link
@@ -926,9 +927,6 @@ func (t *tun) Close() error {
 	return t.close()
 }
 
-	return nil
-}
-
 // Dial an address
 func (t *tun) Dial(channel string, opts ...DialOption) (Session, error) {
 	log.Debugf("Tunnel dialing %s", channel)

tunnel/link.go

@@ -98,7 +98,6 @@ func (l *link) Close() error {
 		return nil
 	default:
 		close(l.closed)
-		return nil
 	}
 
 	return nil

tunnel/listener.go

@@ -181,5 +181,4 @@ func (t *tunListener) Accept() (Session, error) {
 		}
 		return c, nil
 	}
-	return nil, nil
 }

tunnel/session.go

@@ -237,8 +237,6 @@ func (s *session) Send(m *transport.Message) error {
 	case <-s.closed:
 		return io.EOF
 	}
-
-	return nil
 }
 
 // Recv is used to receive a message