Author: ug Date: Tue May 26 16:05:34 2009 New Revision: 57319 URL: http://svn.opensuse.org/viewcvs/yast?rev=57319&view=rev Log: send ACK package for the last DATA package that was received via TFTP (bnc#507086). 2.13.5 Modified: branches/SuSE-SLE-10-SP3-Branch/transfer/VERSION branches/SuSE-SLE-10-SP3-Branch/transfer/agent-tftp/src/TftpAgent.cc branches/SuSE-SLE-10-SP3-Branch/transfer/package/yast2-transfer.changes Modified: branches/SuSE-SLE-10-SP3-Branch/transfer/VERSION URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/transfe... ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/transfer/VERSION (original) +++ branches/SuSE-SLE-10-SP3-Branch/transfer/VERSION Tue May 26 16:05:34 2009 @@ -1 +1 @@ -2.13.4 +2.13.5 Modified: branches/SuSE-SLE-10-SP3-Branch/transfer/agent-tftp/src/TftpAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/transfe... ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/transfer/agent-tftp/src/TftpAgent.cc (original) +++ branches/SuSE-SLE-10-SP3-Branch/transfer/agent-tftp/src/TftpAgent.cc Tue May 26 16:05:34 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: branches/SuSE-SLE-10-SP3-Branch/transfer/package/yast2-transfer.changes URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-SLE-10-SP3-Branch/transfe... ============================================================================== --- branches/SuSE-SLE-10-SP3-Branch/transfer/package/yast2-transfer.changes (original) +++ branches/SuSE-SLE-10-SP3-Branch/transfer/package/yast2-transfer.changes Tue May 26 16:05:34 2009 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Tue May 26 16:04:14 CEST 2009 - ug@suse.de + +- send ACK package for the last DATA package that was received + via TFTP (bnc#507086) +- 2.13.5 + +------------------------------------------------------------------- Thu Jan 11 15:07:11 CET 2007 - ug@suse.de - 2.13.4 -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org