Author: alanmc
Date: 2008-02-17 07:57:45 -0500 (Sun, 17 Feb 2008)
New Revision: 95960
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PieceMessage.cs
Log:
Fixed off-by-one error (only a cosmetic change)
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
2008-02-17 12:39:04 UTC (rev 95959)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
2008-02-17 12:57:45 UTC (rev 95960)
@@ -56,7 +56,7 @@
CreateMessage creator;
if (buffer[offset] == LibtorrentMessage.MessageId)
- return LibtorrentMessage.DecodeMessage(buffer, offset + 1,
count, manager);
+ return LibtorrentMessage.DecodeMessage(buffer, offset + 1,
count - 1, manager);
if (!messageDict.TryGetValue(buffer[offset], out creator))
return new UnknownMessage();
@@ -64,7 +64,7 @@
// The message length is given in the second byte and the message
body follows directly after that
// We decode up to the number of bytes Received. If the message
isn't complete, throw an exception
message = creator(manager);
- message.Decode(buffer, offset + 1, count);
+ message.Decode(buffer, offset + 1, count - 1);
return message;
}
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PieceMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PieceMessage.cs
2008-02-17 12:39:04 UTC (rev 95959)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PieceMessage.cs
2008-02-17 12:57:45 UTC (rev 95960)
@@ -141,7 +141,7 @@
offset += 4;
this.startOffset = ReadInt(buffer, offset);
offset += 4;
- this.requestLength = length - 9;
+ this.requestLength = length - 8;
this.dataOffset = offset;
@@ -156,6 +156,7 @@
{
int bytesRead = 0;
int written = offset;
+
written += Write(buffer, written, messageLength + requestLength);
written += Write(buffer, written, MessageId);
written += Write(buffer, written, pieceIndex);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
