* Otherwise, we're creating the controls for a particular
* panel.
*/
- ctlposinit(&cp, hwnd, 80, 3, 13);
+ ctlposinit(&cp, hwnd, 100, 3, 13);
wc = &ctrls_panel;
base_id = IDCX_PANELBASE;
}
HWND tvstatic;
r.left = 3;
- r.right = r.left + 75;
+ r.right = r.left + 95;
r.top = 3;
r.bottom = r.top + 10;
MapDialogRect(hwnd, &r);
SendMessage(tvstatic, WM_SETFONT, font, MAKELPARAM(TRUE, 0));
r.left = 3;
- r.right = r.left + 75;
+ r.right = r.left + 95;
r.top = 13;
r.bottom = r.top + 219;
MapDialogRect(hwnd, &r);
int ret;
ctrlbox = ctrl_new_box();
- setup_config_box(ctrlbox, &sesslist, FALSE, 0);
+ setup_config_box(ctrlbox, &sesslist, FALSE, 0, 0);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), FALSE);
dp_init(&dp);
winctrl_init(&ctrls_base);
return ret;
}
-int do_reconfig(HWND hwnd)
+int do_reconfig(HWND hwnd, int protcfginfo)
{
Config backup_cfg;
int ret;
backup_cfg = cfg; /* structure copy */
ctrlbox = ctrl_new_box();
- setup_config_box(ctrlbox, NULL, TRUE, cfg.protocol);
+ setup_config_box(ctrlbox, &sesslist, TRUE, cfg.protocol, protcfginfo);
win_setup_config_box(ctrlbox, &dp.hwnd, (help_path != NULL), TRUE);
dp_init(&dp);
winctrl_init(&ctrls_base);
void logevent(void *frontend, const char *string)
{
char timebuf[40];
- time_t t;
+ struct tm tm;
log_eventlog(logctx, string);
events = sresize(events, negsize, char *);
}
- time(&t);
- strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t",
- localtime(&t));
+ tm=ltime();
+ strftime(timebuf, sizeof(timebuf), "%Y-%m-%d %H:%M:%S\t", &tm);
events[nevents] = snewn(strlen(timebuf) + strlen(string) + 1, char);
strcpy(events[nevents], timebuf);
}
/*
- * Ask whether the selected cipher is acceptable (since it was
+ * Ask whether the selected algorithm is acceptable (since it was
* below the configured 'warn' threshold).
- * cs: 0 = both ways, 1 = client->server, 2 = server->client
*/
-void askcipher(void *frontend, char *ciphername, int cs)
+void askalg(void *frontend, const char *algtype, const char *algname)
{
static const char mbtitle[] = "%s Security Alert";
static const char msg[] =
- "The first %.35scipher supported by the server\n"
+ "The first %s supported by the server\n"
"is %.64s, which is below the configured\n"
"warning threshold.\n"
"Do you want to continue with this connection?\n";
char *message, *title;
int mbret;
- message = dupprintf(msg, ((cs == 0) ? "" :
- (cs == 1) ? "client-to-server " :
- "server-to-client "), ciphername);
+ message = dupprintf(msg, algtype, algname);
title = dupprintf(mbtitle, appname);
mbret = MessageBox(NULL, message, title,
MB_ICONWARNING | MB_YESNO);