Author: alanmc
Date: 2008-02-17 07:58:35 -0500 (Sun, 17 Feb 2008)
New Revision: 95962
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/AllowedFastMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveAllMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveNoneMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/RejectRequestMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/SuggestPieceMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTMetadata.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/BitfieldMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/CancelMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/ChokeMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HaveMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/InterestedMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/NotInterestedMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PortMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/RequestMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnchokeMessage.cs
Log:
Cosmetic changes to the Encode methods for consistency
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/AllowedFastMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/AllowedFastMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/AllowedFastMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -67,12 +67,14 @@
if (!ClientEngine.SupportsFastPeer)
throw new ProtocolException("Message encoding not supported");
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
- written += Write(buffer, offset + 5, pieceIndex);
+ int written = offset;
- CheckWritten(written);
- return written;
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+ written += Write(buffer, written, pieceIndex);
+
+ CheckWritten(written - offset);
+ return written - offset;
}
public override void Decode(byte[] buffer, int offset, int length)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveAllMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveAllMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveAllMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -53,11 +53,12 @@
if (!ClientEngine.SupportsFastPeer)
throw new ProtocolException("Message encoding not supported");
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
+ int written = offset;
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
- CheckWritten(written);
- return written;
+ CheckWritten(written - offset);
+ return written - offset;
}
public override void Decode(byte[] buffer, int offset, int length)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveNoneMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveNoneMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveNoneMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -51,12 +51,14 @@
{
if (!ClientEngine.SupportsFastPeer)
throw new ProtocolException("Message encoding not supported");
-
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
- CheckWritten(written);
- return written;
+ int written = offset;
+
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+
+ CheckWritten(written - offset);
+ return written - offset;
}
public override void Decode(byte[] buffer, int offset, int length)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/RejectRequestMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/RejectRequestMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/RejectRequestMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -97,14 +97,16 @@
if (!ClientEngine.SupportsFastPeer)
throw new ProtocolException("Message encoding not supported");
- 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);
+ int written = offset;
- CheckWritten(written);
- return written;
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+ written += Write(buffer, written, pieceIndex);
+ written += Write(buffer, written, startOffset);
+ written += Write(buffer, written, requestLength);
+
+ CheckWritten(written - offset);
+ return written - offset;
}
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/SuggestPieceMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/SuggestPieceMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/SuggestPieceMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -78,12 +78,14 @@
if (!ClientEngine.SupportsFastPeer)
throw new ProtocolException("Message decoding not supported");
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
- written += Write(buffer, offset + 5, pieceIndex);
+ int written = offset;
- CheckWritten(written);
- return written;
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+ written += Write(buffer, written, pieceIndex);
+
+ CheckWritten(written - offset);
+ return written - offset;
}
public override void Decode(byte[] buffer, int offset, int length)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTMetadata.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTMetadata.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTMetadata.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -48,6 +48,7 @@
written += Write(buffer, written, expectedId);
written += Write(buffer, written, 2); // FIXME: We always say we
have no metadata
+ //CheckWritten(written - offset);
return written - offset;
}
}
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/BitfieldMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/BitfieldMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/BitfieldMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -84,13 +84,15 @@
public override int Encode(byte[] buffer, int offset)
{
- int written = Write(buffer, offset, bitField.LengthInBytes + 1);
- written += Write(buffer, offset + 4, MessageId);
- bitField.ToByteArray(buffer, offset + 5);
+ int written = offset;
+
+ written += Write(buffer, written,
bitField.LengthInBytes + 1);
+ written += Write(buffer, written, MessageId);
+ bitField.ToByteArray(buffer, written);
written += (bitField.LengthInBytes);
- CheckWritten(written);
- return written;
+ CheckWritten(written - offset);
+ return written - offset;
}
/// <summary>
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/CancelMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/CancelMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/CancelMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -102,14 +102,16 @@
#region Methods
public override int Encode(byte[] buffer, int offset)
{
- int written = Write(buffer, offset, messageLength);
+ int written = offset;
+
+ 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);
- CheckWritten(written);
- return written;
+ CheckWritten(written - offset);
+ return written - offset;
}
public override void Decode(byte[] buffer, int offset, int length)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/ChokeMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/ChokeMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/ChokeMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -54,11 +54,13 @@
#region Methods
public override int Encode(byte[] buffer, int offset)
{
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
+ int written = offset;
- CheckWritten(written);
- return written;
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+
+ CheckWritten(written - offset);
+ return written - offset;
}
public override void Decode(byte[] buffer, int offset, int length)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HaveMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HaveMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HaveMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -77,12 +77,14 @@
#region Methods
public override int Encode(byte[] buffer, int offset)
{
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
- written += Write(buffer, offset + 5, pieceIndex);
+ int written = offset;
- CheckWritten(written);
- return written;
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+ written += Write(buffer, written, pieceIndex);
+
+ CheckWritten(written - offset);
+ return written - offset;
}
public override void Decode(byte[] buffer, int offset, int length)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/InterestedMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/InterestedMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/InterestedMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -55,11 +55,13 @@
#region Methods
public override int Encode(byte[] buffer, int offset)
{
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
+ int written = offset;
+
+ written += Write(buffer, offset, messageLength);
+ written += Write(buffer, written, MessageId);
- CheckWritten(written);
- return written;
+ CheckWritten(written - offset);
+ return written - offset;
}
public override void Decode(byte[] buffer, int offset, int length)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/NotInterestedMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/NotInterestedMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/NotInterestedMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -55,11 +55,13 @@
public override int Encode(byte[] buffer, int offset)
{
- int written = Write(buffer, offset, messageLength);
+ int written = offset;
+
+ written += Write(buffer, offset, messageLength);
written += Write(buffer, offset + 4, MessageId);
- CheckWritten(written);
- return written;
+ CheckWritten(written - offset);
+ return written - offset;
}
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PortMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PortMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PortMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -97,12 +97,14 @@
public override int Encode(byte[] buffer, int offset)
{
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
- written += Write(buffer, offset + 5, port);
+ int written = offset;
- CheckWritten(written);
- return written;
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+ written += Write(buffer, written, port);
+
+ CheckWritten(written - offset);
+ return written - offset;
}
/// <summary>
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/RequestMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/RequestMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/RequestMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -128,14 +128,16 @@
public override int Encode(byte[] buffer, int offset)
{
- 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);
+ int written = offset;
+
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+ written += Write(buffer, written, pieceIndex);
+ written += Write(buffer, written, startOffset);
+ written += Write(buffer, written, requestLength);
- CheckWritten(written);
- return written;
+ CheckWritten(written - offset);
+ return written - offset;
}
/// <summary>
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnchokeMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnchokeMessage.cs
2008-02-17 12:58:10 UTC (rev 95961)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnchokeMessage.cs
2008-02-17 12:58:35 UTC (rev 95962)
@@ -55,11 +55,13 @@
#region Methods
public override int Encode(byte[] buffer, int offset)
{
- int written = Write(buffer, offset, messageLength);
- written += Write(buffer, offset + 4, MessageId);
+ int written = offset;
- CheckWritten(written);
- return written;
+ written += Write(buffer, written, messageLength);
+ written += Write(buffer, written, MessageId);
+
+ CheckWritten(written - offset);
+ return written - offset;
}
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
