Author: alanmc
Date: 2008-02-02 09:39:33 -0500 (Sat, 02 Feb 2008)
New Revision: 94631

Modified:
   trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/Message.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/BitfieldMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/CancelMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/ChokeMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/AllowedFastMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/HaveAllMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/HaveNoneMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/RejectRequestMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/SuggestPieceMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/HaveMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/InterestedMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/KeepAliveMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/NotInterestedMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/PieceMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/PortMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/RequestMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/UnchokeMessage.cs
   
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PeerConnections/TCPConnection.cs
Log:
Added sanity checking to verify that BytesWritten = ByteLength

Modified: trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/Message.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/Message.cs       
2008-02-02 14:27:37 UTC (rev 94630)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/Message.cs       
2008-02-02 14:39:33 UTC (rev 94631)
@@ -9,6 +9,12 @@
     {
         public abstract int ByteLength { get; }
 
+        protected virtual void CheckWritten(int written)
+        {
+            if (written != ByteLength)
+                throw new MessageException("Message encoded incorrectly. 
Correct number of bytes not written");
+        }
+
         public abstract void Decode(byte[] buffer, int offset, int length);
 
         public void Decode(ArraySegment<byte> buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/BitfieldMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/BitfieldMessage.cs
  2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/BitfieldMessage.cs
  2008-02-02 14:39:33 UTC (rev 94631)
@@ -84,11 +84,13 @@
 
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, bitField.LengthInBytes + 1);
-            Write(buffer, offset + 4, MessageId);
+            int written = Write(buffer, offset, bitField.LengthInBytes + 1);
+            written += Write(buffer, offset + 4, MessageId);
             bitField.ToByteArray(buffer, offset + 5);
+            written += (bitField.LengthInBytes);
 
-            return (this.BitField.LengthInBytes + 5);
+            CheckWritten(written);
+            return written;
         }
 
         /// <summary>

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/CancelMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/CancelMessage.cs
    2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/CancelMessage.cs
    2008-02-02 14:39:33 UTC (rev 94631)
@@ -102,13 +102,14 @@
         #region Methods
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
-            Write(buffer, offset + 5, pieceIndex);
-            Write(buffer, offset + 9, startOffset);
-            Write(buffer, offset + 13, requestLength);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
+            written += Write(buffer, offset + 5, pieceIndex);
+            written += Write(buffer, offset + 9, startOffset);
+            written += Write(buffer, offset + 13, requestLength);
 
-            return (messageLength + 4);
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/ChokeMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/ChokeMessage.cs
     2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/ChokeMessage.cs
     2008-02-02 14:39:33 UTC (rev 94631)
@@ -54,10 +54,11 @@
         #region Methods
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
 
-            return (messageLength + 4);
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/AllowedFastMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/AllowedFastMessage.cs
    2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/AllowedFastMessage.cs
    2008-02-02 14:39:33 UTC (rev 94631)
@@ -67,11 +67,12 @@
             if (!ClientEngine.SupportsFastPeer)
                 throw new ProtocolException("Message encoding not supported");
 
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
-            Write(buffer, offset + 5, pieceIndex);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
+            written += Write(buffer, offset + 5, pieceIndex);
 
-            return this.messageLength + 4;
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/HaveAllMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/HaveAllMessage.cs
        2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/HaveAllMessage.cs
        2008-02-02 14:39:33 UTC (rev 94631)
@@ -53,10 +53,11 @@
             if (!ClientEngine.SupportsFastPeer)
                 throw new ProtocolException("Message encoding not supported");
 
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
 
-            return this.messageLength + 4;
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/HaveNoneMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/HaveNoneMessage.cs
       2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/HaveNoneMessage.cs
       2008-02-02 14:39:33 UTC (rev 94631)
@@ -51,10 +51,12 @@
         {
             if (!ClientEngine.SupportsFastPeer)
                 throw new ProtocolException("Message encoding not supported");
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
+            
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
 
-            return this.messageLength + 4;
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/RejectRequestMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/RejectRequestMessage.cs
  2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/RejectRequestMessage.cs
  2008-02-02 14:39:33 UTC (rev 94631)
@@ -96,13 +96,14 @@
             if (!ClientEngine.SupportsFastPeer)
                 throw new ProtocolException("Message encoding not supported");
 
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
-            Write(buffer, offset + 5, pieceIndex);
-            Write(buffer, offset + 9, startOffset);
-            Write(buffer, offset + 13, requestLength);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
+            written += Write(buffer, offset + 5, pieceIndex);
+            written += Write(buffer, offset + 9, startOffset);
+            written += Write(buffer, offset + 13, requestLength);
 
-            return messageLength + 4;
+            CheckWritten(written);
+            return written;
         }
 
 

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/SuggestPieceMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/SuggestPieceMessage.cs
   2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/FastPeerExtensions/SuggestPieceMessage.cs
   2008-02-02 14:39:33 UTC (rev 94631)
@@ -78,11 +78,12 @@
             if (!ClientEngine.SupportsFastPeer)
                 throw new ProtocolException("Message decoding not supported");
 
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
-            Write(buffer, offset + 5, pieceIndex);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
+            written += Write(buffer, offset + 5, pieceIndex);
 
-            return this.messageLength + 4;
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/HaveMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/HaveMessage.cs
      2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/HaveMessage.cs
      2008-02-02 14:39:33 UTC (rev 94631)
@@ -77,11 +77,12 @@
         #region Methods
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
-            Write(buffer, offset + 5, pieceIndex);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
+            written += Write(buffer, offset + 5, pieceIndex);
 
-            return (messageLength + 4);
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/InterestedMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/InterestedMessage.cs
        2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/InterestedMessage.cs
        2008-02-02 14:39:33 UTC (rev 94631)
@@ -55,10 +55,11 @@
         #region Methods
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
 
-            return (messageLength + 4);
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/KeepAliveMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/KeepAliveMessage.cs
 2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/KeepAliveMessage.cs
 2008-02-02 14:39:33 UTC (rev 94631)
@@ -53,11 +53,13 @@
         #region Methods
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, (byte)0);
-            Write(buffer, offset + 1, (byte)0);
-            Write(buffer, offset + 2, (byte)0);
-            Write(buffer, offset + 3, (byte)0);
-            return 4;
+            int written = Write(buffer, offset, (byte)0);
+            written += Write(buffer, offset + 1, (byte)0);
+            written += Write(buffer, offset + 2, (byte)0);
+            written += Write(buffer, offset + 3, (byte)0);
+
+            CheckWritten(written);
+            return written;
         }
 
         public override void Decode(byte[] buffer, int offset, int length)

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/NotInterestedMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/NotInterestedMessage.cs
     2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/NotInterestedMessage.cs
     2008-02-02 14:39:33 UTC (rev 94631)
@@ -55,10 +55,11 @@
         
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
 
-            return (messageLength + 4);
+            CheckWritten(written);
+            return written;
         }
 
 

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/PieceMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/PieceMessage.cs
     2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/PieceMessage.cs
     2008-02-02 14:39:33 UTC (rev 94631)
@@ -157,18 +157,20 @@
         public override int Encode(byte[] buffer, int offset)
         {
             int bytesRead = 0;
-            Write(buffer, offset, messageLength + requestLength);
-            Write(buffer, offset + 4, MessageId);
-            Write(buffer, offset + 5, pieceIndex);
-            Write(buffer, offset + 9, startOffset);
+            int written = Write(buffer, offset, messageLength + requestLength);
+            written += Write(buffer, offset + 4, MessageId);
+            written += Write(buffer, offset + 5, pieceIndex);
+            written += Write(buffer, offset + 9, startOffset);
 
             long pieceOffset = (long)this.PieceIndex * 
this.manager.FileManager.PieceLength + this.startOffset;
             bytesRead = this.manager.FileManager.Read(buffer, offset + 13, 
pieceOffset, this.RequestLength);
 
             if (bytesRead != this.RequestLength)
                 throw new MessageException("Could not read required data");
+            written += bytesRead;
 
-            return (messageLength + bytesRead + 4);
+            CheckWritten(written);
+            return written;
         }
 
         /// <summary>

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/PortMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/PortMessage.cs
      2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/PortMessage.cs
      2008-02-02 14:39:33 UTC (rev 94631)
@@ -97,11 +97,12 @@
 
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
-            Write(buffer, offset + 5, port);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
+            written += Write(buffer, offset + 5, port);
 
-            return (messageLength + 4);
+            CheckWritten(written);
+            return written;
         }
 
         /// <summary>

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/RequestMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/RequestMessage.cs
   2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/RequestMessage.cs
   2008-02-02 14:39:33 UTC (rev 94631)
@@ -127,13 +127,14 @@
 
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
-            Write(buffer, offset + 5, pieceIndex);
-            Write(buffer, offset + 9, startOffset);
-            Write(buffer, offset + 13, requestLength);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
+            written += Write(buffer, offset + 5, pieceIndex);
+            written += Write(buffer, offset + 9, startOffset);
+            written += Write(buffer, offset + 13, requestLength);
 
-            return (messageLength + 4);
+            CheckWritten(written);
+            return written;
         }
 
         /// <summary>

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/UnchokeMessage.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/UnchokeMessage.cs
   2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessages/UnchokeMessage.cs
   2008-02-02 14:39:33 UTC (rev 94631)
@@ -55,10 +55,11 @@
         #region Methods
         public override int Encode(byte[] buffer, int offset)
         {
-            Write(buffer, offset, messageLength);
-            Write(buffer, offset + 4, MessageId);
+            int written = Write(buffer, offset, messageLength);
+            written += Write(buffer, offset + 4, MessageId);
 
-            return (messageLength + 4);
+            CheckWritten(written);
+            return written;
         }
 
 

Modified: 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PeerConnections/TCPConnection.cs
===================================================================
--- 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PeerConnections/TCPConnection.cs
  2008-02-02 14:27:37 UTC (rev 94630)
+++ 
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PeerConnections/TCPConnection.cs
  2008-02-02 14:39:33 UTC (rev 94631)
@@ -146,6 +146,7 @@
 
         public int EndReceive(IAsyncResult result)
         {
+            
             return this.socket.EndReceive(result);
         }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to