[yast-commit] r57307 - in /trunk/transfer: VERSION agent-tftp/src/TftpAgent.cc package/yast2-transfer.changes

Author: ug Date: Mon May 25 15:30:55 2009 New Revision: 57307 URL: http://svn.opensuse.org/viewcvs/yast?rev=57307&view=rev Log: send ACK package for the last DATA package that was received via TFTP Modified: trunk/transfer/VERSION trunk/transfer/agent-tftp/src/TftpAgent.cc trunk/transfer/package/yast2-transfer.changes Modified: trunk/transfer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/VERSION?rev=57307&r1=573... ============================================================================== --- trunk/transfer/VERSION (original) +++ trunk/transfer/VERSION Mon May 25 15:30:55 2009 @@ -1 +1 @@ -2.16.1 +2.18.0 Modified: trunk/transfer/agent-tftp/src/TftpAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/agent-tftp/src/TftpAgent... ============================================================================== --- trunk/transfer/agent-tftp/src/TftpAgent.cc (original) +++ trunk/transfer/agent-tftp/src/TftpAgent.cc Mon May 25 15:30:55 2009 @@ -158,7 +158,8 @@ cp += len; } else if (finished) { - break; +// dont break here, we need the ACK for the last package +// break; } } /* send packet */ @@ -175,6 +176,9 @@ len = -1; break; } + if( cmd_get && (opcode == 4) && finished ) + // ACK sent + break; /* receive packet */ memset(&from, 0, sizeof(from)); fromlen = sizeof(from); @@ -229,7 +233,7 @@ } } while (timeout && (len >= 0)); - if (len < 0) { + if (len < 0 || finished ) { break; } Modified: trunk/transfer/package/yast2-transfer.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/transfer/package/yast2-transfer.c... ============================================================================== --- trunk/transfer/package/yast2-transfer.changes (original) +++ trunk/transfer/package/yast2-transfer.changes Mon May 25 15:30:55 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon May 25 15:29:01 CEST 2009 - ug@suse.de + +- send ACK package for the last DATA package that was received + via TFTP +- 2.18.0 + +------------------------------------------------------------------- Fri Jan 4 09:46:04 CET 2008 - ug@suse.de - follow HTTP code 301 and 302 (#344123) -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org
participants (1)
-
ug@svn.opensuse.org