Tera TermRevision: 10970
https://osdn.net/projects/ttssh2/scm/svn/commits/10970
Author: nmaya
Date: 2023-10-08 23:41:04 +0900 (Sun, 08 Oct 2023)
Log Message:
-----------
SCP チャネルで SSH_MSG_CHANNEL_EXTENDED_DATA を受信したときにバルーン通知で表示するようにした
SSH_MSG_CHANNEL_DATA と同じように処理して SCP が終了（失敗）していた
issue: https://github.com/TeraTermProject/osdn-download/issues/17
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/ttssh2/ttxssh/ssh.c
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2023-10-08 14:12:11 UTC (rev 10969)
+++ trunk/doc/en/html/about/history.html 2023-10-08 14:41:04 UTC (rev 10970)
@@ -3364,6 +3364,10 @@
<li>Bug fixes
<ul>
<li>when SSH2 dynamic port forwarding is used, an application fault occurs.</li>
+ <li>when receiving SSH_MSG_CHANNEL_EXTENDED_DATA on SCP channel, SCP stops with error.
+ <ul>
+ <li>a message from remote is shown by balloon notify.</li>
+ </ul></li>
<li>stop discarding SSH_MSG_CHANNEL_DATA send that occurs while key re-exchange, send them after finish key exchange.</li>
<li>when <a href="../menu/setup-sshauth.html">Authentication Setup dialog</a> is opened, username setting value is "Use default username" (DefaultUserType=1), nevertheless "Do not enter username" is selected.</li>
</ul>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2023-10-08 14:12:11 UTC (rev 10969)
+++ trunk/doc/ja/html/about/history.html 2023-10-08 14:41:04 UTC (rev 10970)
@@ -3372,6 +3372,10 @@
<li>\x83o\x83O\x8FC\x90\xB3
<ul>
<li>SSH2\x83_\x83C\x83i\x83~\x83b\x83N\x83|\x81[\x83g\x83t\x83H\x83\x8F\x81[\x83f\x83B\x83\x93\x83O\x82\xF0\x8Eg\x97p\x82\xB7\x82\xE9\x82ƈُ\xED\x8FI\x97\xB9\x82\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+ <li>SCP \x82̃`\x83\x83\x83l\x83\x8B\x82\xC5 SSH_MSG_CHANNEL_EXTENDED_DATA \x82\xF0\x8E\xF3\x90M\x82\xB5\x82\xBD\x82Ƃ\xAB\x81A\x83G\x83\x89\x81[\x82ƂȂ\xC1\x82\xC4 SCP \x82\xAA\x8FI\x97\xB9\x82\xB7\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B
+ <ul>
+ <li>\x83\x8A\x83\x82\x81[\x83g\x82\xA9\x82\xE7\x82̃\x81\x83b\x83Z\x81[\x83W\x93\xE0\x97e\x82̓o\x83\x8B\x81[\x83\x93\x92ʒm\x82ŕ\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+ </ul></li>
<li>\x8C\xAE\x8DČ\xF0\x8A\xB7\x82̍Œ\x86\x82ɔ\xAD\x90\xB6\x82\xB5\x82\xBD SSH_MSG_CHANNEL_DATA \x82̑\x97\x90M\x82\xF0\x94j\x8A\xFC\x82\xB9\x82\xB8\x81A\x8C\xAE\x8C\xF0\x8A\xB7\x8A\xAE\x97\xB9\x8C\xE3\x82ɂ܂Ƃ߂đ\x97\x90M\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
<li><a href="../menu/setup-sshauth.html">Authentication Setup \x83_\x83C\x83A\x83\x8D\x83O</a>\x82\xF0\x8AJ\x82\xA2\x82\xBD\x82Ƃ\xAB\x82ɁASSH \x94F\x8FɎg\x97p\x82\xB7\x82郆\x81[\x83U\x96\xBC\x90ݒ肪 "Use default username" (DefaultUserType=1) \x82Ȃ̂\xC9 "Do not enter username" \x82\xAA\x91I\x91\xF0\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
</ul>
Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c 2023-10-08 14:12:11 UTC (rev 10969)
+++ trunk/ttssh2/ttxssh/ssh.c 2023-10-08 14:41:04 UTC (rev 10970)
@@ -9015,7 +9015,18 @@
FWD_received_data(pvar, c->local_num, data, strlen);
} else if (c->type == TYPE_SCP) { // SCP
- SSH2_scp_response(pvar, c, data, strlen);
+ char *msg = (char *)malloc(strlen+1);
+ wchar_t *msgW;
+ memcpy(msg, data, strlen);
+ msg[strlen] = '\0';
+ msgW = ToWcharU8(msg);
+ if (msgW) {
+ NotifySetIconID(pvar->cv, hInst, pvar->settings.IconID);
+ NotifyWarnMessageW(pvar->cv, msgW, L"SSH_MSG_CHANNEL_EXTENDED_DATA");
+ NotifySetIconID(pvar->cv, NULL, 0);
+ free(msgW);
+ }
+ free(msg);
} else if (c->type == TYPE_SFTP) { // SFTP