routed: respect force direct dial context (#1665)

* routed: respect force direct dial context

* Also fix holepunch debug logging params

p2p/host/routed/routed.go

@@ -46,9 +46,12 @@ func Wrap(h host.Host, r Routing) *RoutedHost {
 // RoutedHost's Connect differs in that if the host has no addresses for a
 // given peer, it will use its routing system to try to find some.
 func (rh *RoutedHost) Connect(ctx context.Context, pi peer.AddrInfo) error {
-	// first, check if we're already connected.
-	if rh.Network().Connectedness(pi.ID) == network.Connected {
-		return nil
+	// first, check if we're already connected unless force direct dial.
+	forceDirect, _ := network.GetForceDirectDial(ctx)
+	if !forceDirect {
+		if rh.Network().Connectedness(pi.ID) == network.Connected {
+			return nil
+		}
 	}
 
 	// if we were given some addresses, keep + use them.

p2p/protocol/holepunch/svc.go

@@ -242,7 +242,7 @@ func (s *Service) handleNewStream(str network.Stream) {
 	rtt, addrs, err := s.incomingHolePunch(str)
 	if err != nil {
 		s.tracer.ProtocolError(rp, err)
-		log.Debugw("error handling holepunching stream from", rp, "error", err)
+		log.Debugw("error handling holepunching stream from", "peer", rp, "error", err)
 		str.Reset()
 		return
 	}