Revision: 8004 https://osdn.net/projects/ttssh2/scm/svn/commits/8004 Author: yutakapon Date: 2019-08-21 23:46:54 +0900 (Wed, 21 Aug 2019) Log Message: ----------- プロキシ接続において、IPv6/IPv4フォールバックが期待通りに動いていなかった問題を修正した。 また、この修正により、プロキシサーバにまったく接続できない場合、Connection refused ダイアログが3回連続表示されないようになった。 Modified Paths: -------------- trunk/TTProxy/ProxyWSockHook.h trunk/doc/en/html/about/history.html trunk/doc/ja/html/about/history.html -------------- next part -------------- Modified: trunk/TTProxy/ProxyWSockHook.h =================================================================== --- trunk/TTProxy/ProxyWSockHook.h 2019-08-21 13:30:06 UTC (rev 8003) +++ trunk/TTProxy/ProxyWSockHook.h 2019-08-21 14:46:54 UTC (rev 8004) @@ -1784,7 +1784,12 @@ if (select((int) (s + 1), &ifd, &ofd, &efd, timeout > 0 ? &tv : NULL) == SOCKET_ERROR) return SOCKET_ERROR; if (FD_ISSET(s, &efd)) { - WSASetLastError(WSAECONNREFUSED); + // Proxy server\x82ւ\xCCconnect\x82\xAA\x8E\xB8\x94s\x82\xB5\x82\xBD\x8Fꍇ\x81A\x88Ӑ}\x93I\x82\xC9 WSAECONNREFUSED \x83G\x83\x89\x81[\x82\xF0 + // \x83Z\x83b\x83g\x82\xB7\x82\xE9\x82̂\xF0\x82\xE2\x82߂\xBD\x81B + // Proxy server\x82\xAA\x83z\x83X\x83g\x96\xBC\x82Ƃ\xB5\x82Đݒ肳\x82\xEA\x82Ă\xA2\x82āA\x82\xA9\x82f\x83\x85\x83A\x83\x8B\x83X\x83^\x83b\x83N\x8A\xAB\x82̏ꍇ\x81A + // Tera Term\x91\xA4\x82ł\xCCIPv6/IPv4\x83t\x83H\x81[\x83\x8B\x83o\x83b\x83N\x82\xAA\x8A\xFA\x91Ғʂ\xE8\x82ɓ\xAE\x82\xA2\x82Ă\xA2\x82Ȃ\xA9\x82\xC1\x82\xBD\x81B + // \x82܂\xBD\x81AProxy server\x82ɂ܂\xC1\x82\xBD\x82\xAD\x90ڑ\xB1\x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x81AConnection refused\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA + // 3\x89\xF1\x98A\x91\xB1\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x82Ƃ\xA2\x82\xA4\x93\xAE\x8D\xEC\x82ɂ\xE0\x82Ȃ\xC1\x82Ă\xA2\x82\xBD\x81B return SOCKET_ERROR; } }else{ Modified: trunk/doc/en/html/about/history.html =================================================================== --- trunk/doc/en/html/about/history.html 2019-08-21 13:30:06 UTC (rev 8003) +++ trunk/doc/en/html/about/history.html 2019-08-21 14:46:54 UTC (rev 8004) @@ -4791,7 +4791,8 @@ <h3 id="ttproxy_1.0.0.25">2019.xx.xx (Ver 1.0.0.25)</h3> <ul class="history"> - <li>Depending on OS, it's not working correctly. This bug was introduced in 4.103.</li> + <li>Bug fix: Depending on OS, it's not working correctly. This bug was introduced in 4.103.</li> + <li>Bug fix: IPv6 and IPv4 faullback does not work well. Also, when you can not connect to the proxy server, Connection refused dialog is shown three times in a row.</li> </ul> <h3 id="ttproxy_1.0.0.24">2016.11.30 (Ver 1.0.0.24)</h3> Modified: trunk/doc/ja/html/about/history.html =================================================================== --- trunk/doc/ja/html/about/history.html 2019-08-21 13:30:06 UTC (rev 8003) +++ trunk/doc/ja/html/about/history.html 2019-08-21 14:46:54 UTC (rev 8004) @@ -4797,6 +4797,7 @@ <h3 id="ttproxy_1.0.0.25">2019.xx.xx (Ver 1.0.0.25)</h3> <ul class="history"> <li>OS\x82ɂ\xE6\x82\xC1\x82Đ\xB3\x82\xB5\x82\xAD\x93\xAE\x8D삵\x82Ȃ\xA2\x95s\x8B\x82\xF0\x8FC\x90\xB3\x81B<a href="#teraterm_4.103">teraterm 4.103</a>\x82ł̃G\x83\x93\x83o\x83O\x81B</li> + <li>IPv6/IPv4\x83t\x83H\x81[\x83\x8B\x83o\x83b\x83N\x82\xAA\x93\xAE\x8D삵\x82Ȃ\xA2\x96\xE2\x91\xE8\x82\xF0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B\x82܂\xBD\x81A\x83v\x83\x8D\x83L\x83V\x83T\x81[\x83o\x82ɐڑ\xB1\x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x81AConnection refused\x83_\x83C\x83A\x83\x8D\x83O\x82\xAA3\x89\xF1\x98A\x91\xB1\x95\\x8E\xA6\x82\xB3\x82\xEA\x82\xE9\x96\xE2\x91\xE8\x82\xE0\x8FC\x90\xB3\x82\xB5\x82\xBD\x81B</li> </ul> <h3 id="ttproxy_1.0.0.24">2016.11.30 (Ver 1.0.0.24)</h3>