[Ttssh2-commit] [4609] XMODEM: 送信時、初回のパケットが2回送られる問題を修正した。

svnno****@sourc***** svnno****@sourc*****
2011年 8月 31日 (水) 23:08:02 JST


Revision: 4609
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4609
Author:   yutakapon
Date:     2011-08-31 23:08:02 +0900 (Wed, 31 Aug 2011)

Log Message:
-----------
XMODEM: 送信時、初回のパケットが2回送られる問題を修正した。
cf. http://logmett.com/forum/viewtopic.php?f=2&t=354

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/ja/html/about/history.html
    trunk/teraterm/ttpfile/xmodem.c


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2011-08-31 13:26:25 UTC (rev 4608)
+++ trunk/doc/en/html/about/history.html	2011-08-31 14:08:02 UTC (rev 4609)
@@ -31,6 +31,27 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.72">2011.xx.xx (Ver 4.72)</a></h3>
+<ul class="history">
+  <li>Changes
+    <ul>
+      <li></li>
+    </ul>
+  </li>
+
+  <li>Bug fixes
+    <ul>
+      <li>XMODEM: The first packet is sent out twice by using the xmodem sending function. <br>cf. <a href="http://logmett.com/forum/viewtopic.php?f=2&t=354">why the first xmodem packet been always send out twice?</a></li>
+    </ul>
+  </li>
+
+  <li>Misc
+    <ul>
+      <li></li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="teraterm_4.71">2011.8.31 (Ver 4.71)</a></h3>
 <ul class="history">
   <li>Changes

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2011-08-31 13:26:25 UTC (rev 4608)
+++ trunk/doc/ja/html/about/history.html	2011-08-31 14:08:02 UTC (rev 4609)
@@ -31,6 +31,27 @@
 
 <h2><a name="teraterm">Tera Term</a></h2>
 
+<h3><a name="teraterm_4.72">2011.xx.xx (Ver 4.72)</a></h3>
+<ul class="history">
+  <li>•ÏX
+    <ul>
+      <li></li>
+    </ul>
+  </li>
+
+  <li>ƒoƒOC³
+    <ul>
+      <li>XMODEM: ‘—MŽžA‰‰ñ‚̃pƒPƒbƒg‚ª2‰ñ‘—‚ç‚ê‚é–â‘è‚ðC³‚µ‚½B<br>cf. <a href="http://logmett.com/forum/viewtopic.php?f=2&t=354">why the first xmodem packet been always send out twice?</a></li>
+    </ul>
+  </li>
+
+  <li>‚»‚Ì‘¼
+    <ul>
+      <li></li>
+    </ul>
+  </li>
+</ul>
+
 <h3><a name="teraterm_4.71">2011.8.31 (Ver 4.71)</a></h3>
 <ul class="history">
   <li>•ÏX

Modified: trunk/teraterm/ttpfile/xmodem.c
===================================================================
--- trunk/teraterm/ttpfile/xmodem.c	2011-08-31 13:26:25 UTC (rev 4608)
+++ trunk/teraterm/ttpfile/xmodem.c	2011-08-31 14:08:02 UTC (rev 4609)
@@ -417,11 +417,10 @@
 			case CAN:
 				break;
 			case 0x43:
-				if ((xv->PktNum == 0) && (xv->PktNumOffset == 0)) {
-					if ((xv->XOpt == XoptCheck) && (xv->PktNumSent == 0))
+				if ((xv->PktNum == 0) && (xv->PktNumOffset == 0) && (xv->PktNumSent == 0)) {
+					 if ((xv->XOpt == XoptCheck))
 						XSetOpt(fv, xv, XoptCRC);
-					if (xv->XOpt != XoptCheck)
-						SendFlag = TRUE;
+					SendFlag = TRUE;
 				}
 				break;
 			}



Ttssh2-commit メーリングリストの案内