[9860] ignore continuous handshake signal('C', 0x43) (ttssh2-commit) - Tera Term

Revision: 9860
          https://osdn.net/projects/ttssh2/scm/svn/commits/9860
Author:   zmatsuo
Date:     2022-04-14 21:42:07 +0900 (Thu, 14 Apr 2022)
Log Message:
-----------
ignore continuous handshake signal('C',0x43)

- 転送前に、受信側が送信した複数の 'C' を正しく処理する
- 修正前は、蓄積した各々の'C'に対してデータの再送を行っていた
- 修正後は、連続した'C'を無視するようになった

ticket #39667

Ticket Links:
------------
    https://osdn.net/projects/ttssh2/tracker/detail/39667

Modified Paths:
--------------
    branches/4-stable/doc/en/html/about/history.html
    branches/4-stable/doc/ja/html/about/history.html
    branches/4-stable/teraterm/ttpfile/ymodem.c

-------------- next part --------------
Modified: branches/4-stable/doc/en/html/about/history.html
===================================================================

--- branches/4-stable/doc/en/html/about/history.html	2022-04-14 12:41:54 UTC (rev 9859)
+++ branches/4-stable/doc/en/html/about/history.html	2022-04-14 12:42:07 UTC (rev 9860)
@@ -36,6 +36,7 @@
   <li>Changes
     <ul>
       <li>XMODEM: Fix to check all received datas and process correctly, even if received datas are accumulated.</li>
+      <li>YMODEM: ignore continuous 'C' when waiting for sending.</li>
     </ul>
   </li>
 

Modified: branches/4-stable/doc/ja/html/about/history.html
===================================================================
--- branches/4-stable/doc/ja/html/about/history.html	2022-04-14 12:41:54 UTC (rev 9859)
+++ branches/4-stable/doc/ja/html/about/history.html	2022-04-14 12:42:07 UTC (rev 9860)
@@ -35,7 +35,8 @@
 <ul class="history">
   <li>\x95ύX
     <ul>
-      <li>XMODEM \x8E\xF3\x90M\x83f\x81[\x83^\x82\xAA\x92~\x90ς\xB5\x82Ă\xE0\x91S\x91̂𒲂ׂĐ\xB3\x82\xB5\x82\xAD\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x82悤\x82ɏC\x90\xB3\x82\xB5\x82\xBD</li>
+      <li>XMODEM \x8E\xF3\x90M\x83f\x81[\x83^\x82\xAA\x92~\x90ς\xB5\x82Ă\xE0\x91S\x91̂𒲂ׂĐ\xB3\x82\xB5\x82\xAD\x8F\x88\x97\x9D\x82\xB7\x82\xE9\x82悤\x82ɏC\x90\xB3\x82\xB5\x82\xBD\x81B</li>
+      <li>YMODEM \x91\x97\x90M\x91҂\xBF\x82̎\x9E\x81A\x98A\x91\xB1\x82\xB5\x82\xBD 'C' \x82𖳎\x8B\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
     </ul>
   </li>
 

Modified: branches/4-stable/teraterm/ttpfile/ymodem.c
===================================================================
--- branches/4-stable/teraterm/ttpfile/ymodem.c	2022-04-14 12:41:54 UTC (rev 9859)
+++ branches/4-stable/teraterm/ttpfile/ymodem.c	2022-04-14 12:42:07 UTC (rev 9860)
@@ -732,7 +732,7 @@
 			case 'C':
 			case 'G':
 				// 'C'\x82\xF0\x8E󂯎\xE6\x82\xE9\x82ƁA\x83u\x83\x8D\x83b\x83N\x82̑\x97\x90M\x82\xF0\x8AJ\x8En\x82\xB7\x82\xE9\x81B
-				if ((0 == yv->PktNum) && (0 == yv->PktNumOffset))
+				if ((0 == yv->PktNum) && (0 == yv->PktNumOffset) && !(yv->LastMessage == 'C'))
 				{
 					// \x83t\x83@\x83C\x83\x8B\x8F\xEE\x95񑗐M\x8C\xE3\x81AACK -> 'C' \x82Ǝ\xF3\x90M\x82\xB5\x82\xBD\x82̂ŁA\x8E\x9F\x82̃u\x83\x8D\x83b\x83N\x82𑗐M\x82\xB7\x82\xE9\x81B
 					if (yv->SendFileInfo)


Tera Term

[ttssh2-commit] [9860] ignore continuous handshake signal('C', 0x43)