X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/a4b92c62ec6707f23264cde68a684f0bf377ee91..b89053c0750e42d88ff92e3efc3d546f18a6d435:/windlg.c

diff --git a/windlg.c b/windlg.c
index 89ead9a2..cb19e76d 100644
--- a/windlg.c
+++ b/windlg.c
@@ -454,6 +454,11 @@ enum { IDCX_ABOUT =
     IDC_PROXYPORTEDIT,
     IDC_PROXYEXCLUDESTATIC,
     IDC_PROXYEXCLUDEEDIT,
+    IDC_PROXYLOCALHOST,
+    IDC_PROXYDNSSTATIC,
+    IDC_PROXYDNSNO,
+    IDC_PROXYDNSAUTO,
+    IDC_PROXYDNSYES,
     IDC_PROXYUSERSTATIC,
     IDC_PROXYUSEREDIT,
     IDC_PROXYPASSSTATIC,
@@ -882,7 +887,13 @@ char *help_context_cmd(int id)
         return "JI(`',`proxy.main')";
       case IDC_PROXYEXCLUDESTATIC:
       case IDC_PROXYEXCLUDEEDIT:
+      case IDC_PROXYLOCALHOST:
         return "JI(`',`proxy.exclude')";
+      case IDC_PROXYDNSSTATIC:
+      case IDC_PROXYDNSNO:
+      case IDC_PROXYDNSAUTO:
+      case IDC_PROXYDNSYES:
+	return "JI(`',`proxy.dns')";
       case IDC_PROXYUSERSTATIC:
       case IDC_PROXYUSEREDIT:
       case IDC_PROXYPASSSTATIC:
@@ -1349,6 +1360,11 @@ static void init_dlg_ctrls(HWND hwnd, int keepsess)
     SetDlgItemText(hwnd, IDC_PROXYHOSTEDIT, cfg.proxy_host);
     SetDlgItemInt(hwnd, IDC_PROXYPORTEDIT, cfg.proxy_port, FALSE);
     SetDlgItemText(hwnd, IDC_PROXYEXCLUDEEDIT, cfg.proxy_exclude_list);
+    CheckDlgButton(hwnd, IDC_PROXYLOCALHOST, cfg.even_proxy_localhost);
+    CheckRadioButton(hwnd, IDC_PROXYDNSNO, IDC_PROXYDNSYES,
+		     cfg.proxy_dns == PROXYDNS_NO ? IDC_PROXYDNSNO :
+		     cfg.proxy_dns == PROXYDNS_YES ? IDC_PROXYDNSYES :
+		     IDC_PROXYDNSAUTO);
     SetDlgItemText(hwnd, IDC_PROXYTELNETCMDEDIT, cfg.proxy_telnet_command);
     SetDlgItemText(hwnd, IDC_PROXYUSEREDIT, cfg.proxy_username);
     SetDlgItemText(hwnd, IDC_PROXYPASSEDIT, cfg.proxy_password);
@@ -1850,7 +1866,7 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
     }
 
     if (panel == proxypanelstart) {
-	/* The Proxy panel. Accelerators used: [acgoh] ntslypeuwmv */
+	/* The Proxy panel. Accelerators used: [acgoh] ntslypeuwmvxd */
 	struct ctlpos cp;
 	ctlposinit(&cp, hwnd, 80, 3, 13);
 	if (dlgtype == 0) {
@@ -1868,6 +1884,13 @@ static void create_controls(HWND hwnd, int dlgtype, int panel)
 	    multiedit(&cp,
 		      "&Exclude Hosts/IPs", IDC_PROXYEXCLUDESTATIC,
 		      IDC_PROXYEXCLUDEEDIT, 100, NULL);
+	    checkbox(&cp, "Consider pro&xying local host connections",
+		     IDC_PROXYLOCALHOST);
+	    radioline(&cp, "Do &DNS name lookup at proxy end:",
+		      IDC_PROXYDNSSTATIC, 3,
+		      "No", IDC_PROXYDNSNO,
+		      "Auto", IDC_PROXYDNSAUTO,
+		      "Yes", IDC_PROXYDNSYES, NULL);
 	    staticedit(&cp, "&Username", IDC_PROXYUSERSTATIC,
 		       IDC_PROXYUSEREDIT, 60);
 	    staticpassedit(&cp, "Pass&word", IDC_PROXYPASSSTATIC,
@@ -3023,6 +3046,23 @@ static int GenericMainDlgProc(HWND hwnd, UINT msg,
 			IsDlgButtonChecked(hwnd, IDC_PROXYSOCKSVER4) ? 4 : 5;
 		}
 		break;
+	      case IDC_PROXYLOCALHOST:
+		if (HIWORD(wParam) == BN_CLICKED ||
+		    HIWORD(wParam) == BN_DOUBLECLICKED)
+		    cfg.even_proxy_localhost =
+		    IsDlgButtonChecked(hwnd, IDC_PROXYLOCALHOST);
+		break;
+	      case IDC_PROXYDNSNO:
+	      case IDC_PROXYDNSAUTO:
+	      case IDC_PROXYDNSYES:
+		if (HIWORD(wParam) == BN_CLICKED ||
+		    HIWORD(wParam) == BN_DOUBLECLICKED) {
+		    cfg.proxy_dns =
+			IsDlgButtonChecked(hwnd, IDC_PROXYDNSNO) ? PROXYDNS_NO :
+			IsDlgButtonChecked(hwnd, IDC_PROXYDNSYES) ? PROXYDNS_YES :
+			PROXYDNS_AUTO;
+		}
+		break;
 	      case IDC_PROXYTYPENONE:
 	      case IDC_PROXYTYPEHTTP:
 	      case IDC_PROXYTYPESOCKS:
@@ -3911,9 +3951,7 @@ int askappend(void *frontend, char *filename)
 	"or Cancel to disable logging.";
     char message[sizeof(msgtemplate) + FILENAME_MAX];
     int mbret;
-    if (cfg.logxfovr != LGXF_ASK) {
-	return ((cfg.logxfovr == LGXF_OVR) ? 2 : 1);
-    }
+
     sprintf(message, msgtemplate, FILENAME_MAX, filename);
 
     mbret = MessageBox(NULL, message, mbtitle,