[10962] 不要な受信処理停止を削除、削除関数のプロトタイプ削除、コメント修正 (ttssh2-commit) - Tera Term

Revision: 10962
          https://osdn.net/projects/ttssh2/scm/svn/commits/10962
Author:   zmatsuo
Date:     2023-10-08 15:17:15 +0900 (Sun, 08 Oct 2023)
Log Message:
-----------
不要な受信処理停止を削除、削除関数のプロトタイプ削除、コメント修正

- r10960の修正

Modified Paths:
--------------
    trunk/ttssh2/ttxssh/pkt.c
    trunk/ttssh2/ttxssh/ssh.c

-------------- next part --------------
Modified: trunk/ttssh2/ttxssh/pkt.c
===================================================================

--- trunk/ttssh2/ttxssh/pkt.c	2023-10-08 04:58:55 UTC (rev 10961)
+++ trunk/ttssh2/ttxssh/pkt.c	2023-10-08 06:17:15 UTC (rev 10962)
@@ -318,13 +318,6 @@
 			// \x83p\x83P\x83b\x83g\x82̎\xF3\x90M
 			int amount_read;
 
-			// SCP\x83t\x83@\x83C\x83\x8B\x8E\xF3\x90M\x8F\x88\x97\x9D\x82\xF0\x88ꎞ\x92\xE2\x8E~\x92\x86\x82Ȃ\xE7\x82΁Arecv()\x82\xF0\x82\xB5\x82Ȃ\xA2\x81B
-			if (pvar->recv.suspended) {
-				// \x82\xBB\x82\xEA\x82܂łɎ\xF3\x90M\x82\xB5\x82\xBD\x83f\x81[\x83^\x83T\x83C\x83Y\x82\xF0Tera Term\x91\xA4\x82ɕԂ\xB7\x81B
-				return amount_in_buf;
-
-			}
-
 			amount_read = recv_data(pvar, READAMOUNT);
 
 			if (amount_read == SOCKET_ERROR) {

Modified: trunk/ttssh2/ttxssh/ssh.c
===================================================================
--- trunk/ttssh2/ttxssh/ssh.c	2023-10-08 04:58:55 UTC (rev 10961)
+++ trunk/ttssh2/ttxssh/ssh.c	2023-10-08 06:17:15 UTC (rev 10962)
@@ -154,7 +154,6 @@
 static void do_SSH2_dispatch_setup_for_transfer(PTInstVar pvar);
 static void ssh2_prep_userauth(PTInstVar pvar);
 static void ssh2_send_newkeys(PTInstVar pvar);
-static void ssh2_scp_recv_unblocked(PTInstVar pvar);
 
 // \x83}\x83N\x83\x8D
 #define remained_payload(pvar) ((pvar)->ssh_state.payload + payload_current_offset(pvar))
@@ -8548,13 +8547,10 @@
 	c->scp.pktlist_cursize += buflen;
 
 	// \x83L\x83\x85\x81[\x82ɋl\x82񂾃f\x81[\x83^\x82̑\x8D\x83T\x83C\x83Y\x82\xAA\x8F\xE3\x8C\xC0臒l\x82𒴂\xA6\x82\xBD\x8Fꍇ\x81A
-	// SSH\x83T\x81[\x83o\x82\xA9\x82\xE7\x82̎\xF3\x90M\x82\xF0\x92\xE2\x8E~\x82\xB7\x82\xE9\x82悤\x82Ɏw\x8E\xA6\x82\xF0\x8Fo\x82\xB7\x81B
+	// SSH\x83T\x81[\x83o\x82\xCCwindows size\x82̍X\x90V\x82\xF0\x92\xE2\x8E~\x82\xB7\x82\xE9
 	// \x82\xB1\x82\xEA\x82ɂ\xE6\x82胊\x83X\x83g\x83G\x83\x93\x83g\x83\x8A\x82\xAA\x91\x9D\x82\xA6\x91\xB1\x82\xAF\x81A\x8F\xC1\x94\x83\x82\x83\x8A\x82̔\xEC\x91剻\x82\xF0
 	// \x89\xF1\x94\xF0\x82ł\xAB\x82\xE9\x81B
 	if (c->scp.pktlist_cursize >= SCPRCV_HIGH_WATER_MARK) {
-		// \x82\xB1\x82̃t\x83\x89\x83O\x82𗧂Ă\xBD\x8Fꍇ\x81ASSH\x92ʐM\x91S\x91̂\xCCrecv()\x82\xF0\x83u\x83\x8D\x83b\x83N\x82\xB7\x82邽\x82߁A
-		// SCP\x8F\x88\x97\x9D\x82\xAA\x8A\xAE\x97\xB9 or \x92\x86\x92f\x82\xB3\x82ꂽ\x8Fꍇ\x82́A\x82\xA9\x82Ȃ炸\x83t\x83\x89\x83O\x82𗎂Ƃ\xB5\x82Ă\xA8\x82\xAD
-		// \x95K\x97v\x82\xAA\x82\xA0\x82\xE9\x81B
 		logprintf(LOG_LEVEL_NOTICE,
 			"%s: enter suspend", __FUNCTION__);
 		pvar->recv.suspended = TRUE;
@@ -8597,7 +8593,7 @@
 	c->scp.pktlist_cursize -= *buflen;
 
 	// \x83L\x83\x85\x81[\x82ɋl\x82񂾃f\x81[\x83^\x82̑\x8D\x83T\x83C\x83Y\x82\xAA\x89\xBA\x8C\xC0臒l\x82\xF0\x89\xBA\x89\xF1\x82\xC1\x82\xBD\x8Fꍇ\x81A
-	// SSH\x83T\x81[\x83o\x82\xA9\x82\xE7\x82̎\xF3\x90M\x82\xF0\x8DĊJ\x82\xB7\x82\xE9\x82悤\x82Ɏw\x8E\xA6\x82\xF0\x8Fo\x82\xB7\x81B
+	// SSH\x83T\x81[\x83o\x82\xD6window size\x82̍X\x90V\x82\xF0\x8DĊJ\x82\xB7\x82\xE9
 	if (c->scp.pktlist_cursize <= SCPRCV_LOW_WATER_MARK) {
 		logprintf(LOG_LEVEL_NOTICE, "%s: SCP receive resumed", __FUNCTION__);
 		// \x83u\x83\x8D\x83b\x83N\x82\xB5\x82Ă\xA2\x82\xE9\x8Fꍇ


Tera Term

[ttssh2-commit] [10962] 不要な受信処理停止を削除、削除関数のプロトタイプ削除、コメント修正