Tera TermRevision: 10575
https://osdn.net/projects/ttssh2/scm/svn/commits/10575
Author: nmaya
Date: 2023-02-04 21:46:03 +0900 (Sat, 04 Feb 2023)
Log Message:
-----------
SSH2_MSG_CHANNEL_OPEN_FAILURE が開けなかったときの MessageBox を DisablePopupMessage で抑止できるようにした
ticket: #40863
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/40863
Modified Paths:
--------------
branches/4-stable/doc/en/html/setup/teraterm-ssh.html
branches/4-stable/doc/ja/html/setup/teraterm-ssh.html
branches/4-stable/installer/release/TERATERM.INI
branches/4-stable/ttssh2/ttxssh/ssh.c
branches/4-stable/ttssh2/ttxssh/ttxssh.h
-------------- next part --------------
Modified: branches/4-stable/doc/en/html/setup/teraterm-ssh.html
===================================================================
--- branches/4-stable/doc/en/html/setup/teraterm-ssh.html 2023-02-04 10:15:45 UTC (rev 10574)
+++ branches/4-stable/doc/en/html/setup/teraterm-ssh.html 2023-02-04 12:46:03 UTC (rev 10575)
@@ -52,11 +52,11 @@
</p>
<pre>
-DisablePopupMessage=<Display Method>
+DisablePopupMessage=<Suppress Message>
</pre>
<p>
-The display method can be specified with 0 or 1.
+The "Suppress Message" can be specified with the sum value of suppressing message type.
Meaning of each value is as follows.
</p>
@@ -66,7 +66,8 @@
</thead>
<tbody>
<tr> <td>0</td> <td>Not suppress pop-up window</td> </tr>
- <tr> <td>1</td> <td>Suppress pop-up window</td> </tr>
+ <tr> <td>1</td> <td>Suppress "sending forwarded data to a local port error" pop-up message</td> </tr>
+ <tr> <td>2</td> <td>Suppress "SSH channel open error" pop-up window</td> </tr>
</tbody>
</table>
Modified: branches/4-stable/doc/ja/html/setup/teraterm-ssh.html
===================================================================
--- branches/4-stable/doc/ja/html/setup/teraterm-ssh.html 2023-02-04 10:15:45 UTC (rev 10574)
+++ branches/4-stable/doc/ja/html/setup/teraterm-ssh.html 2023-02-04 12:46:03 UTC (rev 10575)
@@ -50,11 +50,12 @@
</p>
<pre>
-DisablePopupMessage=<\x95\\x8E\xA6\x95\xFB\x96@>
+DisablePopupMessage=<\x97}\x8E~\x83\x81\x83b\x83Z\x81[\x83W>
</pre>
<p>
-\x95\\x8E\xA6\x95\xFB\x96@\x82ɂ\xCD 0 \x82\xA9 1 \x82\xAA\x8Ew\x92\xE8\x82ł\xAB\x82܂\xB7\x81B\x82\xBB\x82ꂼ\x82\xEA\x82̒l\x82̈Ӗ\xA1\x82͈ȉ\xBA\x82̂Ƃ\xA8\x82\xE8\x82ł\xB7\x81B
+"\x97}\x8E~\x83\x81\x83b\x83Z\x81[\x83W" \x82́A\x97}\x8E~\x82\xB7\x82郁\x83b\x83Z\x81[\x83W\x8E\xED\x97ނ\xB2\x82Ƃ̒l\x82𑫂\xB5\x82\xBD\x90\x94\x92l\x82\xF0\x8Ew\x92肵\x82Ă\xAD\x82\xBE\x82\xB3\x82\xA2\x81B
+\x82\xBB\x82ꂼ\x82\xEA\x82̒l\x82̈Ӗ\xA1\x82͈ȉ\xBA\x82̂Ƃ\xA8\x82\xE8\x82ł\xB7\x81B
</p>
<table>
@@ -63,7 +64,8 @@
</thead>
<tbody>
<tr> <td>0</td> <td>\x83|\x83b\x83v\x83A\x83b\x83v\x82\xF0\x97}\x8E~\x82\xB5\x82Ȃ\xA2</td> </tr>
- <tr> <td>1</td> <td>\x83|\x83b\x83v\x83A\x83b\x83v\x82\xF0\x97}\x8E~\x82\xB7\x82\xE9</td> </tr>
+ <tr> <td>1</td> <td>"\x83\x8D\x81[\x83J\x83\x8B\x83|\x81[\x83g\x82ւ̓]\x91\x97\x83f\x81[\x83^\x82̑\x97\x90M\x83G\x83\x89\x81[" \x83|\x83b\x83v\x83A\x83b\x83v\x82\xF0\x97}\x8E~\x82\xB7\x82\xE9</td> </tr>
+ <tr> <td>2</td> <td>"SSH \x83`\x83\x83\x83l\x83\x8B\x83I\x81[\x83v\x83\x93\x83G\x83\x89\x81[" \x83|\x83b\x83v\x83A\x83b\x83v\x82\xF0\x97}\x8E~\x82\xB7\x82\xE9</td> </tr>
</tbody>
</table>
Modified: branches/4-stable/installer/release/TERATERM.INI
===================================================================
--- branches/4-stable/installer/release/TERATERM.INI 2023-02-04 10:15:45 UTC (rev 10574)
+++ branches/4-stable/installer/release/TERATERM.INI 2023-02-04 12:46:03 UTC (rev 10575)
@@ -951,8 +951,10 @@
SSHIcon=Default
; Disable error popup-message box
-; 0 ... Default(not disabling)
-; 1 ... Sending forwarded data to a local port
+; The sum of following values:
+; 0 ... Default (not disabling)
+; 1 ... Disable message: sending forwarded data to a local port error
+; 2 ... Disable message: SSH channel open error
DisablePopupMessage=0
; X11 Forwarding
Modified: branches/4-stable/ttssh2/ttxssh/ssh.c
===================================================================
--- branches/4-stable/ttssh2/ttxssh/ssh.c 2023-02-04 10:15:45 UTC (rev 10574)
+++ branches/4-stable/ttssh2/ttxssh/ssh.c 2023-02-04 12:46:03 UTC (rev 10575)
@@ -7664,7 +7664,12 @@
"SSH2_MSG_CHANNEL_OPEN_FAILURE was received.\r\nchannel [%d]: reason: %s(%d) message: %s");
_snprintf_s(tmpbuf, sizeof(tmpbuf), _TRUNCATE, pvar->ts->UIMsg,
id, rmsg, reason, NonNull(cstring));
- notify_nonfatal_error(pvar, tmpbuf);
+ if ((pvar->settings.DisablePopupMessage & POPUP_MSG_FWD_channel_open) == 0) {
+ notify_nonfatal_error(pvar, tmpbuf);
+ }
+ else {
+ logputs(LOG_LEVEL_ERROR, tmpbuf);
+ }
free(cstring);
Modified: branches/4-stable/ttssh2/ttxssh/ttxssh.h
===================================================================
--- branches/4-stable/ttssh2/ttxssh/ttxssh.h 2023-02-04 10:15:45 UTC (rev 10574)
+++ branches/4-stable/ttssh2/ttxssh/ttxssh.h 2023-02-04 12:46:03 UTC (rev 10575)
@@ -124,6 +124,7 @@
*/
#define POPUP_MSG_default 0
#define POPUP_MSG_FWD_received_data (1 << 0)
+#define POPUP_MSG_FWD_channel_open (1 << 1)
/*