In local-to-remote copies, abort if fxp_init() fails, rather than ploughing

[u/mdw/putty] / proxy.c

diff --git a/proxy.c b/proxy.c
index 5baab7a..ad3b814 100644 (file)
--- a/proxy.c
+++ b/proxy.c
@@ -16,9 +16,7 @@
 
 #define do_proxy_dns(cfg) \
     (cfg->proxy_dns == FORCE_ON || \
-        (cfg->proxy_dns == AUTO && \
-              cfg->proxy_type != PROXY_SOCKS4 && \
-              cfg->proxy_type != PROXY_SOCKS5))
+        (cfg->proxy_dns == AUTO && cfg->proxy_type != PROXY_SOCKS4))
 
 /*
  * Call this when proxy negotiation is complete, so that this
@@ -191,6 +189,15 @@ static const char * sk_proxy_socket_error (Socket s)
 
 /* basic proxy plug functions */
 
+static void plug_proxy_log(Plug plug, int type, SockAddr addr, int port,
+                          const char *error_msg, int error_code)
+{
+    Proxy_Plug pp = (Proxy_Plug) plug;
+    Proxy_Socket ps = pp->proxy_socket;
+
+    plug_log(ps->plug, type, addr, port, error_msg, error_code);
+}
+
 static int plug_proxy_closing (Plug p, const char *error_msg,
                               int error_code, int calling_back)
 {
@@ -372,6 +379,7 @@ Socket new_connection(SockAddr addr, char *hostname,
     };
 
     static const struct plug_function_table plug_fn_table = {
+       plug_proxy_log,
        plug_proxy_closing,
        plug_proxy_receive,
        plug_proxy_sent,