svnno****@sourc*****
svnno****@sourc*****
2017年 4月 3日 (月) 21:51:40 JST
Tera TermRevision: 6663
http://sourceforge.jp/projects/ttssh2/scm/svn/commits/6663
Author: doda
Date: 2017-04-03 21:51:40 +0900 (Mon, 03 Apr 2017)
Log Message:
-----------
転送した Agent へのアクセス時にバルーンで通知する機能の追加
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/installer/release/TERATERM.INI
trunk/ttssh2/ttxssh/fwd.c
trunk/ttssh2/ttxssh/ttxssh.c
trunk/ttssh2/ttxssh/ttxssh.h
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2017-04-03 12:51:37 UTC (rev 6662)
+++ trunk/doc/en/html/about/history.html 2017-04-03 12:51:40 UTC (rev 6663)
@@ -31,6 +31,28 @@
<h2><a name="teraterm">Tera Term</a></h2>
+<h3><a name="teraterm_4.94">2017.05.xx (Ver 4.95)</a></h3>
+<ul class="history">
+ <!-- li>Changes
+ <ul>
+ <li></li>
+ </ul>
+ </li -->
+
+ <!-- li>Bug fixes
+ <ul>
+ <li></li>
+ </ul>
+ </li -->
+
+ <li>Misc
+ <ul>
+ <li>upgraded TTSSH to <a href="#ttssh_2.81">2.81</a></li>
+ </ul>
+ </li>
+</ul>
+
+
<h3><a name="teraterm_4.94">2017.02.28 (Ver 4.94)</a></h3>
<ul class="history">
<li>Changes
@@ -2844,11 +2866,11 @@
<h3><a name="ttssh_2.81">2017.05.xx (Ver 2.81)</a></h3>
<ul class="history">
- <!-- li>Changes
+ <li>Changes
<ul>
- <li></li>
+ <!-- li>\x83\x8A\x83\x82\x81[\x83g\x83z\x83X\x83g\x82\xAA\x93]\x91\x97\x82\xB5\x82\xBD\x83G\x81[\x83W\x83F\x83\x93\x83g\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x8E\x9E\x82ɒʒm\x82\xB7\x82\xE9\x8B@\x94\\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li -->
</ul>
- </li -->
+ </li>
<!--li>Bug fixes
<ul>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2017-04-03 12:51:37 UTC (rev 6662)
+++ trunk/doc/ja/html/about/history.html 2017-04-03 12:51:40 UTC (rev 6663)
@@ -31,6 +31,28 @@
<h2><a name="teraterm">Tera Term</a></h2>
+<h3><a name="teraterm_4.95">2017.05.xx (Ver 4.95)</a></h3>
+<ul class="history">
+ <!-- li>\x95ύX
+ <ul>
+ <li>li>
+ </ul>
+ </li -->
+
+ <!-- li>\x83o\x83O\x8FC\x90\xB3
+ <ul>
+ <li>li>
+ </ul>
+ </li -->
+
+ <li>\x82\xBB\x82̑\xBC
+ <ul>
+ <li><a href="#ttssh_2.81">TTSSH(2.81)</a>\x82֍\xB7\x82\xB5\x91ւ\xA6\x82\xBD\x81B</li>
+ </ul>
+ </li>
+</ul>
+
+
<h3><a name="teraterm_4.94">2017.02.28 (Ver 4.94)</a></h3>
<ul class="history">
<li>\x95ύX
@@ -2849,11 +2871,11 @@
<h3><a name="ttssh_2.81">2017.05.xx (Ver 2.81)</a></h3>
<ul class="history">
- <!-- li>\x95ύX
+ <li>\x95ύX
<ul>
- <li></li>
+ <li>\x83\x8A\x83\x82\x81[\x83g\x83z\x83X\x83g\x82\xAA\x93]\x91\x97\x82\xB5\x82\xBD\x83G\x81[\x83W\x83F\x83\x93\x83g\x82\xF0\x8Eg\x97p\x82\xB5\x82\xBD\x8E\x9E\x82ɒʒm\x82\xB7\x82\xE9\x8B@\x94\\x82\xF0\x92lj\xC1\x82\xB5\x82\xBD\x81B</li>
</ul>
- </li -->
+ </li>
<!--li>\x83o\x83O\x8FC\x90\xB3
<ul>
Modified: trunk/installer/release/TERATERM.INI
===================================================================
--- trunk/installer/release/TERATERM.INI 2017-04-03 12:51:37 UTC (rev 6662)
+++ trunk/installer/release/TERATERM.INI 2017-04-03 12:51:40 UTC (rev 6663)
@@ -865,6 +865,9 @@
; Confirm SSH agent forwarding (1=enabled 0=disabled)
ForwardAgentConfirm=1
+; Notify forwarded agent access (1=enabled 0=disabled)
+ForwardAgentNotify=1
+
; Verify host key by DNS (1=enabled 0=disabled)
VerifyHostKeyDNS=0
Modified: trunk/ttssh2/ttxssh/fwd.c
===================================================================
--- trunk/ttssh2/ttxssh/fwd.c 2017-04-03 12:51:37 UTC (rev 6662)
+++ trunk/ttssh2/ttxssh/fwd.c 2017-04-03 12:51:40 UTC (rev 6663)
@@ -37,6 +37,8 @@
#include "fwd.h"
+#include "ttcommon.h"
+
#include <assert.h>
#ifndef NO_INET6
#include "WSAAsyncGetAddrInfo.h"
@@ -1932,6 +1934,11 @@
BOOL FWD_agent_forward_confirm(PTInstVar pvar)
{
HWND cur_active = GetActiveWindow();
+
+ if (pvar->session_settings.ForwardAgentNotify) {
+ NotifyMessage(pvar->cv, "Remote host access to agent", "Agent Forwarding");
+ }
+
if (pvar->session_settings.ForwardAgentConfirm) {
UTIL_get_lang_msg("MSG_FWD_AGENT_FORWARDING_CONFIRM", pvar,
"Are you sure you want to accept agent-forwarding request?");
Modified: trunk/ttssh2/ttxssh/ttxssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.c 2017-04-03 12:51:37 UTC (rev 6662)
+++ trunk/ttssh2/ttxssh/ttxssh.c 2017-04-03 12:51:40 UTC (rev 6663)
@@ -521,6 +521,9 @@
// agent forward \x8Am\x94F\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9
settings->ForwardAgentConfirm = read_BOOL_option(fileName, "ForwardAgentConfirm", TRUE);
+ // agent forward \x8Am\x94F\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9
+ settings->ForwardAgentNotify = read_BOOL_option(fileName, "ForwardAgentNotify", TRUE);
+
// \x83z\x83X\x83g\x8C\xAE\x82\xCC DNS \x82ł̃`\x83F\x83b\x83N (RFC 4255)
settings->VerifyHostKeyDNS = read_BOOL_option(fileName, "VerifyHostKeyDNS", TRUE);
@@ -641,6 +644,10 @@
WritePrivateProfileString("TTSSH", "ForwardAgentConfirm",
settings->ForwardAgentConfirm ? "1" : "0", fileName);
+ // agent forward \x92ʒm\x82\xF0\x97L\x8C\xF8\x82ɂ\xB7\x82\xE9
+ WritePrivateProfileString("TTSSH", "ForwardAgentNotify",
+ settings->ForwardAgentNotify ? "1" : "0", fileName);
+
// \x83z\x83X\x83g\x8C\xAE\x82\xCC DNS \x82ł̃`\x83F\x83b\x83N (RFC 4255)
WritePrivateProfileString("TTSSH", "VerifyHostKeyDNS",
settings->VerifyHostKeyDNS ? "1" : "0", fileName);
Modified: trunk/ttssh2/ttxssh/ttxssh.h
===================================================================
--- trunk/ttssh2/ttxssh/ttxssh.h 2017-04-03 12:51:37 UTC (rev 6662)
+++ trunk/ttssh2/ttxssh/ttxssh.h 2017-04-03 12:51:40 UTC (rev 6663)
@@ -172,6 +172,9 @@
// Confirm Agent forwarding
BOOL ForwardAgentConfirm;
+ // Confirm Agent forwarding
+ BOOL ForwardAgentNotify;
+
// KEX order(derived from teraterm.ini)
char KexOrder[KEX_DH_MAX+1];
char HostKeyOrder[KEY_MAX+1];