Browse Source

Log selected protocol for each connection attempt

Rod Hynes 11 years ago
parent
commit
4d35639913
2 changed files with 2 additions and 1 deletions
  1. 0 1
      psiphon/runTunnel.go
  2. 2 0
      psiphon/tunnel.go

+ 0 - 1
psiphon/runTunnel.go

@@ -53,7 +53,6 @@ func establishTunnelWorker(
 			return
 		default:
 		}
-		Notice(NOTICE_INFO, "connecting to %s in region %s", serverEntry.IpAddress, serverEntry.Region)
 		tunnel, err := EstablishTunnel(tunnelProtocol, sessionId, serverEntry, pendingConns)
 		if err != nil {
 			// TODO: distingush case where conn is interrupted?

+ 2 - 0
psiphon/tunnel.go

@@ -100,6 +100,8 @@ func EstablishTunnel(
 			return nil, ContextError(fmt.Errorf("server does not have any supported capabilities"))
 		}
 	}
+	Notice(NOTICE_INFO, "connecting to %s in region %s using %s",
+		serverEntry.IpAddress, serverEntry.Region, selectedProtocol)
 	// The meek protocols tunnel obfuscated SSH. Obfuscated SSH is layered on top of SSH.
 	// So depending on which protocol is used, multiple layers are initialized.
 	port := 0