[8027] ProxyやNAT経由でサーバに接続できない場合、すでに切断状態にも関わらず、 (Ttssh2-commit) - Tera Term

Revision: 8027
          https://osdn.net/projects/ttssh2/scm/svn/commits/8027
Author:   yutakapon
Date:     2019-08-28 23:09:45 +0900 (Wed, 28 Aug 2019)
Log Message:
-----------
ProxyやNAT経由でサーバに接続できない場合、すでに切断状態にも関わらず、
認証ダイアログが表示されたままとなる問題を修正した。

Modified Paths:
--------------
    branches/ttssh_improved/ttssh2/ttxssh/auth.c
    branches/ttssh_improved/ttssh2/ttxssh/ssh.c
    branches/ttssh_improved/ttssh2/ttxssh/ttxssh.c

-------------- next part --------------
Modified: branches/ttssh_improved/ttssh2/ttxssh/auth.c
===================================================================

--- branches/ttssh_improved/ttssh2/ttxssh/auth.c	2019-08-28 13:09:31 UTC (rev 8026)
+++ branches/ttssh_improved/ttssh2/ttxssh/auth.c	2019-08-28 14:09:45 UTC (rev 8027)
@@ -1315,6 +1315,8 @@
 
 void AUTH_advance_to_next_cred(PTInstVar pvar)
 {
+	logprintf(LOG_LEVEL_VERBOSE, "User authentication will be shown by %d method.", pvar->auth_state.cur_cred.method);
+
 	pvar->auth_state.failed_method = pvar->auth_state.cur_cred.method;
 
 	if (pvar->auth_state.cur_cred.method == SSH_AUTH_NONE) {

Modified: branches/ttssh_improved/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/ttssh_improved/ttssh2/ttxssh/ssh.c	2019-08-28 13:09:31 UTC (rev 8026)
+++ branches/ttssh_improved/ttssh2/ttxssh/ssh.c	2019-08-28 14:09:45 UTC (rev 8027)
@@ -2933,6 +2933,10 @@
 	if ((pvar->ssh_state.status_flags & STATUS_HOST_OK) == 0) {
 		pvar->ssh_state.status_flags |= STATUS_HOST_OK;
 		send_session_key(pvar);
+		// \x83\x86\x81[\x83U\x94F\x8F؂\xF0\x8Ds\x82\xC1\x82Ă悢\x83^\x83C\x83~\x83\x93\x83O\x82ɂȂ\xC1\x82Ă\xA9\x82\xE7\x81A\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x8C\xBB\x82\xB3\x82\xB9\x82\xE9\x81B
+		// STATUS_HOST_OK\x82\xAA\x97\xA7\x82\xBF\x81ASTATUS_DONT_SEND_USER_NAME\x82\xAA\x97\x8E\x82\xBF\x82Ă\xA2\x82Ȃ\xA2\x82ƁA
+		// \x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82͎\xC0\x8E\xBF\x8Eg\x82\xA6\x82Ȃ\xA2\x82̂ŁA\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82Ŗ\xE2\x91\xE8\x82Ȃ\xA2\x81B
+		AUTH_advance_to_next_cred(pvar);
 	}
 }
 

Modified: branches/ttssh_improved/ttssh2/ttxssh/ttxssh.c
===================================================================
--- branches/ttssh_improved/ttssh2/ttxssh/ttxssh.c	2019-08-28 13:09:31 UTC (rev 8026)
+++ branches/ttssh_improved/ttssh2/ttxssh/ttxssh.c	2019-08-28 14:09:45 UTC (rev 8027)
@@ -795,7 +795,11 @@
 
 		if (pvar->NotificationWindow == NULL) {
 			pvar->NotificationWindow = hWnd;
-			AUTH_advance_to_next_cred(pvar);
+			// AUTH_advance_to_next_cred()\x82̌Ăяo\x82\xB5\x82\xF0\x8D폜\x82\xB7\x82\xE9\x81B
+			// NotificationWindow\x82Ƀn\x83\x93\x83h\x83\x8B\x82͐ݒ肵\x82Ă\xA8\x82\xAD\x82\xAA\x81A\x82\xB1\x82̃^\x83C\x83~\x83\x93\x83O\x82ł\xCD
+			// \x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82\xF0\x8Fo\x82\xB7\x82̂͑\x81\x82\xB7\x82\xAC\x82\xBD\x81BProxy\x82\xE2NAT\x8Co\x97R\x82ŃT\x81[\x83o\x82ɐڑ\xB1
+			// \x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x81A\x82\xB7\x82łɐؒf\x8F\xF3\x91Ԃɂ\xE0\x8Aւ\xED\x82炸\x81A\x94F\x8F؃_\x83C\x83A\x83\x8D\x83O\x82\xAA
+			// \x95\\x8E\xA6\x82\xB3\x82ꂽ\x82܂܂ƂȂ\xC1\x82Ă\xA2\x82\xBD\x81B
 		}
 	}
 


Tera Term

[Ttssh2-commit] [8027] ProxyやNAT経由でサーバに接続できない場合、すでに切断状態にも関わらず、