X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/e479b152ca3b0861ba5fd93abec89619e1d37061..9e164d82c8990d3c8cff58d866fb9938907d4d7b:/mac/mac.c diff --git a/mac/mac.c b/mac/mac.c index f1f2bf32..25362061 100644 --- a/mac/mac.c +++ b/mac/mac.c @@ -71,6 +71,7 @@ static int cold = 1; static int borednow = FALSE; struct mac_gestalts mac_gestalts; UInt32 sleeptime; +static long timing_next_time; static void mac_startup(void); static void mac_eventloop(void); @@ -209,13 +210,10 @@ static void mac_startup(void) { default_protocol = be_default_protocol; /* Find the appropriate default port. */ { - int i; + Backend *b = backend_from_proto(default_protocol); default_port = 0; /* illegal */ - for (i = 0; backends[i].backend != NULL; i++) - if (backends[i].protocol == default_protocol) { - default_port = backends[i].backend->default_port; - break; - } + if (b) + default_port = b->default_port; } flags = FLAG_INTERACTIVE; @@ -244,16 +242,31 @@ static void mac_startup(void) { NewAEEventHandlerUPP(&mac_aevt_quit), 0, FALSE); } +void timer_change_notify(long next) +{ + timing_next_time = next; +} + static void mac_eventloop(void) { Boolean gotevent; EventRecord event; RgnHandle cursrgn; + long next; + long ticksleft; cursrgn = NewRgn(); sleeptime = 0; for (;;) { - mac_adjustcursor(cursrgn); + ticksleft=timing_next_time-GETTICKCOUNT(); + if (sleeptime > ticksleft && ticksleft >=0) + sleeptime=ticksleft; gotevent = WaitNextEvent(everyEvent, &event, sleeptime, cursrgn); + if (timing_next_time <= GETTICKCOUNT()) { + if (run_timers(timing_next_time, &next)) { + timer_change_notify(next); + } + } + /* * XXX For now, limit sleep time to 1/10 s to work around * wake-before-sleep race in MacTCP code. @@ -267,9 +280,8 @@ static void mac_eventloop(void) { if (borednow) cleanup_exit(0); } - sk_poll(); if (!gotevent) - mac_pollterm(); + sk_poll(); if (mac_gestalts.apprvers >= 0x100 && mac_frontwindow() != NULL) IdleControls(mac_frontwindow()); } @@ -457,6 +469,9 @@ static void mac_menucommand(long result) { case iOpen: mac_opensession(); goto done; + case iChange: + mac_reconfig(); + goto done; case iClose: mac_closewindow(window); goto done; @@ -552,6 +567,7 @@ static void mac_adjustmenus(void) { if (window != NULL && mac_wininfo(window)->adjustmenus != NULL) (*mac_wininfo(window)->adjustmenus)(window); else { + DisableItem(menu, iChange); DisableItem(menu, iSave); DisableItem(menu, iSaveAs); DisableItem(menu, iDuplicate); @@ -640,9 +656,10 @@ void cleanup_exit(int status) } /* This should only kill the current session, not the whole application. */ -void connection_fatal(void *fontend, char *fmt, ...) { +void connection_fatal(void *frontend, char *fmt, ...) { va_list ap; Str255 stuff; + Session *s = frontend; va_start(ap, fmt); /* We'd like stuff to be a Pascal string */ @@ -650,7 +667,11 @@ void connection_fatal(void *fontend, char *fmt, ...) { va_end(ap); ParamText(stuff, NULL, NULL, NULL); StopAlert(128, NULL); - cleanup_exit(1); + + s->session_closed = TRUE; + + if (s->cfg.close_on_exit == FORCE_ON) + mac_closewindow(s->window); } /* Null SSH agent client -- never finds an agent. */ @@ -672,41 +693,70 @@ int agent_query(void *in, int inlen, void **out, int *outlen, /* Temporary null routines for testing. */ -void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, - char *keystr, char *fingerprint) +int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, + char *keystr, char *fingerprint, + void (*callback)(void *ctx, int result), void *ctx) { - Str255 stuff; + Str255 pappname; + Str255 pfingerprint; + Str255 pkeytype; Session *s = frontend; + int ret, alertret; + + c2pstrcpy(pappname, appname); + c2pstrcpy(pkeytype, keytype); + c2pstrcpy(pfingerprint, fingerprint); /* - * This function is horribly wrong. For one thing, the alert - * shouldn't be modal, it should be movable modal, or a sheet in - * Aqua. Also, PuTTY might be in the background, in which case we - * should use the Notification Manager to wake up the user. In - * any case, we shouldn't hold up processing of other connections' - * data just because this one's waiting for the user. It should - * also handle a host key cache, of course, and see the note below - * about closing the connection. All in all, a bit of a mess - * really. + * The alert shouldn't be modal, it should be movable modal, or + * a sheet in Aqua. Also, PuTTY might be in the background, in + * which case we should use the Notification Manager to wake up + * the user. In any case, we shouldn't hold up processing of + * other connections' data just because this one's waiting for + * the user. */ - stuff[0] = sprintf((char *)(&stuff[1]), - "The server's key fingerprint is: %s\n" - "Continue connecting?", fingerprint); - ParamText(stuff, NULL, NULL, NULL); - if (CautionAlert(wQuestion, NULL) == 2) { - /* - * User chose "Cancel". Unfortunately, if I tear the - * connection down here, Bad Things happen when I return. I - * think this function should actually return something - * telling the SSH code to abandon the connection. - */ + /* Verify the key against the cache */ + + ret = verify_host_key(host, port, keytype, keystr); + + if (ret == 0) { /* success - key matched OK */ + return 1; + } else if (ret == 2) { /* key was different */ + ParamText(pappname, pkeytype, pfingerprint, NULL); + alertret=CautionAlert(wWrong, NULL); + if (alertret == 8) { + /* Cancel */ + return 0; + } else if (alertret == 9) { + /* Connect Just Once */ + return 1; + } else { + /* Update Key */ + store_host_key(host, port, keytype, keystr); + return 1; + } + } else /* ret == 1 */ { /* key was absent */ + ParamText(pkeytype, pfingerprint, pappname, NULL); + alertret=CautionAlert(wAbsent, NULL); + if (alertret == 7) { + /* Cancel */ + return 0; + } else if (alertret == 8) { + /* Connect Just Once */ + return 1; + } else { + /* Update Key */ + store_host_key(host, port, keytype, keystr); + return 1; + } } } -void askalg(void *frontend, const char *algtype, const char *algname) +int askalg(void *frontend, const char *algtype, const char *algname, + void (*callback)(void *ctx, int result), void *ctx) { - + return 0; } void old_keyfile_warning(void) @@ -784,7 +834,41 @@ void update_specials_menu(void *frontend) mac_adjustmenus(); } -void notify_remote_exit(void *fe) { /* XXX anything needed here? */ } +void notify_remote_exit(void *frontend) +{ + Session *s = frontend; + int exitcode; + + if (!s->session_closed && + (exitcode = s->back->exitcode(s->backhandle)) >=0) { + s->session_closed = TRUE; + if (s->cfg.close_on_exit == FORCE_ON || + (s->cfg.close_on_exit == AUTO && exitcode == 0)) { + mac_closewindow(s->window); + return; + } + + /* The session's dead */ + + if (s->ldisc) { + ldisc_free(s->ldisc); + s->ldisc = NULL; + } + + if (s->back) { + s->back->free(s->backhandle); + s->backhandle = NULL; + s->back = NULL; + update_specials_menu(s); + } + + { + char title[100]; + sprintf(title, "%.70s (inactive)", appname); + set_title(s, title); + } + } +} /* * Local Variables: