Return-Path: Delivered-To: apmail-commons-commits-archive@locus.apache.org Received: (qmail 39662 invoked from network); 24 Feb 2008 21:36:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 24 Feb 2008 21:36:36 -0000 Received: (qmail 92119 invoked by uid 500); 24 Feb 2008 21:36:29 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 92060 invoked by uid 500); 24 Feb 2008 21:36:29 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 92051 invoked by uid 99); 24 Feb 2008 21:36:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Feb 2008 13:36:29 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 24 Feb 2008 21:36:04 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8D0501A983A; Sun, 24 Feb 2008 13:36:13 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r630682 - /commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java Date: Sun, 24 Feb 2008 21:36:13 -0000 To: commits@commons.apache.org From: rwinston@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080224213613.8D0501A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rwinston Date: Sun Feb 24 13:36:12 2008 New Revision: 630682 URL: http://svn.apache.org/viewvc?rev=630682&view=rev Log: NET-181 Modified: commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java Modified: commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java URL: http://svn.apache.org/viewvc/commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java?rev=630682&r1=630681&r2=630682&view=diff ============================================================================== --- commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java (original) +++ commons/proper/net/trunk/src/java/org/apache/commons/net/tftp/TFTPClient.java Sun Feb 24 13:36:12 2008 @@ -231,13 +231,19 @@ throw e; } ++block; + if (block > 65535) + { + // wrap the block number + block = 0; + } + break _receivePacket; } else { discardPackets(); - if (lastBlock == (block - 1)) + if (lastBlock == (block == 0 ? 65535 : (block - 1))) continue _sendPacket; // Resend last acknowledgement. continue _receivePacket; // Start fetching packets again. @@ -464,6 +470,11 @@ if (lastBlock == block) { ++block; + if (block > 65535) + { + // wrap the block number + block = 0; + } if (lastAckWait) { break _sendPacket; @@ -476,7 +487,7 @@ { discardPackets(); - if (lastBlock == (block - 1)) + if (lastBlock == (block == 0 ? 65535 : (block - 1))) continue _sendPacket; // Resend last acknowledgement. continue _receivePacket; // Start fetching packets again.