svnno****@sourc*****
svnno****@sourc*****
2017年 5月 9日 (火) 23:24:24 JST
Tera TermRevision: 6708
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6708
Author: doda
Date: 2017-05-09 23:24:23 +0900 (Tue, 09 May 2017)
Log Message:
-----------
エージェントチャネルを切るとサーバからセッション自体を切られるので、エラー時は SSH_AGENT_FAILURE を返すように変更
Modified Paths:
--------------
trunk/ttssh2/putty/libputty.h
trunk/ttssh2/ttxssh/ssh.c
-------------- next part --------------
Modified: trunk/ttssh2/putty/libputty.h
===================================================================
--- trunk/ttssh2/putty/libputty.h 2017-05-09 14:23:36 UTC (rev 6707)
+++ trunk/ttssh2/putty/libputty.h 2017-05-09 14:24:23 UTC (rev 6708)
@@ -8,6 +8,9 @@
// \x8A\x94\x82̃v\x83\x8D\x83g\x83^\x83C\x83v\x90錾\x82\xE0\x82\xB1\x82\xB1\x82ɂ\xA0\x82\xE9\x82̂Ŏ\xE6\x82肠\x82\xA6\x82\xB8\x82\xB1\x82\xB1\x82ŁB
#define AGENT_MAX_MSGLEN 8192
+// \x83G\x83\x89\x81[\x89\x9E\x93\x9A\x97p
+#define SSH_AGENT_FAILURE_MSG "\x00\x00\x00\x01\x05"
+
// MISC.C
extern void safefree(void *);
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2017-05-09 14:23:36 UTC (rev 6707)
+++ trunk/ttssh2/ttxssh/ssh.c 2017-05-09 14:24:23 UTC (rev 6708)
@@ -9170,12 +9170,13 @@
return TRUE;
error:
- // \x83G\x83\x89\x81[\x8E\x9E\x82\xCD channel \x82\xF0\x95‚\xB6\x82\xE9
+ // \x83G\x83\x89\x81[\x8E\x9E\x82\xCD SSH_AGENT_FAILURE \x82\xF0\x95Ԃ\xB7
if (SSHv2(pvar)) {
- ssh2_channel_send_close(pvar, c);
+ SSH2_send_channel_data(pvar, c, SSH_AGENT_FAILURE_MSG, sizeof(SSH_AGENT_FAILURE_MSG), 0);
}
else {
- SSH_channel_input_eof(pvar, fc->remote_num, local_channel_num);
+ SSH_channel_send(pvar, local_channel_num, fc->remote_num,
+ SSH_AGENT_FAILURE_MSG, sizeof(SSH_AGENT_FAILURE_MSG), 0);
}
// \x8Eg\x82\xA2\x8FI\x82\xED\x82\xC1\x82\xBD\x83o\x83b\x83t\x83@\x82\xF0\x83N\x83\x8A\x83A