Author: alanmc
Date: 2008-02-08 20:21:30 -0500 (Fri, 08 Feb 2008)
New Revision: 95315
Added:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/MessageBundle.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UnknownMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PieceWriter/
Removed:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/MessageBundle.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PeerMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnknownMessage.cs
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Block.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/BufferedFileWrite.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ChokeUnchokeManager.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ConnectionManager.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/DiskManager.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/FileManager.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ListenManager.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/PieceManager.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/TorrentManager.cs
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/ExtendedHandshakeMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTChat.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTMetadata.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTSupport.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LibtorrentMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/Message.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/HandshakeMessage.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/KeepAliveMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/NotInterestedMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PieceMessage.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
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/AnnounceMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/AnnounceResponseMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ConnectMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ConnectResponseMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ErrorMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/PeerDetailsMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeDetails.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeResponseMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/UdpTrackerMessage.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PeerConnections/PeerConnectionBase.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PiecePicking/PiecePickerBase.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PiecePicking/StandardPicker.cs
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Tracker/UdpTracker.cs
Log:
Re-namespaced the messages
Modified: trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Block.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Block.cs 2008-02-09
01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Block.cs 2008-02-09
01:21:30 UTC (rev 95315)
@@ -29,7 +29,7 @@
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Standard;
namespace MonoTorrent.Client
{
/// <summary>
Modified: trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/BufferedFileWrite.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/BufferedFileWrite.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/BufferedFileWrite.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -7,12 +7,12 @@
namespace MonoTorrent.Client
{
- internal class BufferedIO
+ public class BufferedIO
{
#region Fields
public ArraySegment<byte> Buffer;
- public PeerIdInternal Id;
+ internal PeerIdInternal Id;
public PeerMessage Message;
public Piece Piece;
public ManualResetEvent WaitHandle;
@@ -22,13 +22,13 @@
#region Constructors
- public BufferedIO(PeerIdInternal id, ArraySegment<byte> buffer,
PeerMessage message, Piece piece)
+ internal BufferedIO(PeerIdInternal id, ArraySegment<byte> buffer,
PeerMessage message, Piece piece)
: this(id, buffer, message, piece, null)
{
}
- public BufferedIO(PeerIdInternal id, ArraySegment<byte> buffer,
PeerMessage message, Piece piece, ManualResetEvent handle)
+ internal BufferedIO(PeerIdInternal id, ArraySegment<byte> buffer,
PeerMessage message, Piece piece, ManualResetEvent handle)
{
this.Id = id;
this.Buffer = buffer;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ChokeUnchokeManager.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ChokeUnchokeManager.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ChokeUnchokeManager.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -4,7 +4,8 @@
using MonoTorrent.Common;
using System.IO;
using MonoTorrent.Client.Messages;
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Standard;
+using MonoTorrent.Client.Messages.FastPeer;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ConnectionManager.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ConnectionManager.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ConnectionManager.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -37,8 +37,10 @@
using System.Collections.Generic;
using System.Net;
using MonoTorrent.Client.Messages;
-using MonoTorrent.Client.Messages.PeerMessages;
using MonoTorrent.Client.Connections;
+using MonoTorrent.Client.Messages.FastPeer;
+using MonoTorrent.Client.Messages.Standard;
+using MonoTorrent.Client.Messages.Libtorrent;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/DiskManager.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/DiskManager.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/DiskManager.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -5,7 +5,7 @@
using System.Security.Cryptography;
using System.IO;
using MonoTorrent.Common;
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Standard;
namespace MonoTorrent.Client.Managers
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/FileManager.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/FileManager.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/FileManager.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -35,7 +35,7 @@
using System.Collections.Generic;
using System.Threading;
using System.Xml.Serialization;
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Standard;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ListenManager.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ListenManager.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/ListenManager.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -4,7 +4,7 @@
using MonoTorrent.Common;
using MonoTorrent.Client.Encryption;
using System.Net.Sockets;
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Standard;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/PieceManager.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/PieceManager.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/PieceManager.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -33,7 +33,8 @@
using MonoTorrent.Common;
using MonoTorrent.Client;
using System.Threading;
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Standard;
+using MonoTorrent.Client.Messages.FastPeer;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/TorrentManager.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/TorrentManager.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Managers/TorrentManager.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -39,8 +39,8 @@
using System.Diagnostics;
using MonoTorrent.BEncoding;
using MonoTorrent.Client.Tracker;
-using MonoTorrent.Client.Messages.PeerMessages;
using MonoTorrent.Client.Messages;
+using MonoTorrent.Client.Messages.Standard;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/AllowedFastMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/AllowedFastMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/AllowedFastMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -33,9 +33,9 @@
using System.Net;
using MonoTorrent.Client.Encryption;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.FastPeer
{
- public class AllowedFastMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class AllowedFastMessage : PeerMessage
{
public const byte MessageId = 0x11;
private readonly int messageLength = 5;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveAllMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveAllMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveAllMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -32,9 +32,9 @@
using System.Text;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.FastPeer
{
- public class HaveAllMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class HaveAllMessage : PeerMessage
{
public const byte MessageId = 0x0E;
private readonly int messageLength = 1;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveNoneMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveNoneMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/HaveNoneMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -32,9 +32,9 @@
using System.Text;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.FastPeer
{
- public class HaveNoneMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class HaveNoneMessage : PeerMessage
{
public const byte MessageId = 0x0F;
private readonly int messageLength = 1;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/RejectRequestMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/RejectRequestMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/RejectRequestMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -31,10 +31,11 @@
using System;
using System.Text;
using System.Net;
+using MonoTorrent.Client.Messages.Standard;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.FastPeer
{
- public class RejectRequestMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class RejectRequestMessage : PeerMessage
{
public const byte MessageId = 0x10;
public readonly int messageLength = 13;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/SuggestPieceMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/SuggestPieceMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/FastPeerExtensions/SuggestPieceMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -32,10 +32,10 @@
using System.Text;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.FastPeer
{
// FIXME: The only use for a SuggestPiece message is for when i load a
piece into a Disk Cache and want to make use for it
- public class SuggestPieceMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class SuggestPieceMessage : PeerMessage
{
public const byte MessageId = 0x0D;
private readonly int messageLength = 5;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/ExtendedHandshakeMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/ExtendedHandshakeMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/ExtendedHandshakeMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -34,7 +34,7 @@
using MonoTorrent.BEncoding;
using System.Collections.Generic;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Libtorrent
{
/// <summary>
/// This class represents the BT_EXTENDED_LST as listed by the LibTorrent
Extended Messaging Protocol
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTChat.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTChat.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTChat.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -2,9 +2,8 @@
using System.Collections.Generic;
using System.Text;
using MonoTorrent.BEncoding;
-using MonoTorrent.Client.Messages.PeerMessages;
-namespace MonoTorrent.Client.Messages.LibtorrentMessages
+namespace MonoTorrent.Client.Messages.Libtorrent
{
public class LTChat : LibtorrentMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTMetadata.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTMetadata.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTMetadata.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -1,9 +1,8 @@
using System;
using System.Collections.Generic;
using System.Text;
-using MonoTorrent.Client.Messages.PeerMessages;
-namespace MonoTorrent.Client.Messages.LibtorrentMessages
+namespace MonoTorrent.Client.Messages.Libtorrent
{
public class LTMetadata : LibtorrentMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTSupport.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTSupport.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LTSupport.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Libtorrent
{
public struct LTSupport
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LibtorrentMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LibtorrentMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/LibtorrentMessages/LibtorrentMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -1,10 +1,9 @@
using System;
using System.Collections.Generic;
using System.Text;
-using MonoTorrent.Client.Messages.PeerMessages;
-using MonoTorrent.Client.Messages.LibtorrentMessages;
+using MonoTorrent.Client.Messages.Standard;
-namespace MonoTorrent.Client.Messages
+namespace MonoTorrent.Client.Messages.Libtorrent
{
public abstract class LibtorrentMessage : PeerMessage
{
Modified: trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/Message.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/Message.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/Message.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -12,7 +12,7 @@
protected virtual void CheckWritten(int written)
{
if (written != ByteLength)
- throw new MessageException("Message encoded incorrectly.
Correct number of bytes not written");
+ throw new MessageException("Message encoded incorrectly.
Incorrect number of bytes written");
}
public abstract void Decode(byte[] buffer, int offset, int length);
@@ -68,10 +68,6 @@
return Write(buffer, offset, (short)value);
}
- private static int Write(byte[] buffer, int offset, byte[] value)
- {
- return Write(buffer, offset, value, 0, value.Length);
- }
static protected int Write(byte[] buffer, int offset, short value)
{
return Write(buffer, offset,
BitConverter.GetBytes(IPAddress.HostToNetworkOrder(value)));
@@ -96,5 +92,10 @@
{
return Write(buffer, offset, (long)value);
}
+
+ static private int Write(byte[] buffer, int offset, byte[] value)
+ {
+ return Write(buffer, offset, value, 0, value.Length);
+ }
}
}
\ No newline at end of file
Added:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/MessageBundle.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/MessageBundle.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/MessageBundle.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace MonoTorrent.Client.Messages
+{
+ class MessageBundle : PeerMessage
+ {
+ private List<PeerMessage> messages;
+
+ public List<PeerMessage> Messages
+ {
+ get { return messages; }
+ }
+
+ public MessageBundle()
+ {
+ messages = new List<PeerMessage>();
+ }
+
+ internal override void Handle(PeerIdInternal id)
+ {
+ throw new InvalidOperationException();
+ }
+
+ public override int ByteLength
+ {
+ get
+ {
+ int total = 0;
+ messages.ForEach(delegate(PeerMessage m) { total +=
m.ByteLength; });
+ return total;
+ }
+ }
+
+ public override void Decode(byte[] buffer, int offset, int length)
+ {
+ throw new InvalidOperationException();
+ }
+
+ public override int Encode(byte[] buffer, int offset)
+ {
+ int written = offset;
+ messages.ForEach(delegate(PeerMessage m) { written +=
m.Encode(buffer, written); });
+
+ CheckWritten(written - offset);
+ return written - offset;
+ }
+ }
+}
Property changes on:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/MessageBundle.cs
___________________________________________________________________
Name: svn:eol-style
+ native
Added: trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -0,0 +1,101 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Net;
+using MonoTorrent.Client.Messages.FastPeer;
+using MonoTorrent.Client.Messages.Standard;
+using MonoTorrent.Client.Messages.Libtorrent;
+
+namespace MonoTorrent.Client.Messages
+{
+ public abstract class PeerMessage : Message
+ {
+ internal abstract void Handle(PeerIdInternal id);
+
+ public static PeerMessage DecodeMessage(ArraySegment<byte> buffer, int
offset, int count, TorrentManager manager)
+ {
+ return DecodeMessage(buffer.Array, buffer.Offset + offset, count,
manager);
+ }
+
+ public static PeerMessage DecodeMessage(byte[] buffer, int offset, int
count, TorrentManager manager)
+ {
+ PeerMessage message;
+
+ // The first byte tells us what kind of message it is
+ switch (buffer[offset])
+ {
+ case AllowedFastMessage.MessageId:
+ message = new AllowedFastMessage();
+ break;
+
+ case BitfieldMessage.MessageId:
+ message = new
BitfieldMessage(manager.Torrent.Pieces.Count);
+ break;
+
+ case CancelMessage.MessageId:
+ message = new CancelMessage();
+ break;
+
+ case ChokeMessage.MessageId:
+ message = new ChokeMessage();
+ break;
+
+ case HaveAllMessage.MessageId:
+ message = new HaveAllMessage();
+ break;
+
+ case HaveMessage.MessageId:
+ message = new HaveMessage();
+ break;
+
+ case HaveNoneMessage.MessageId:
+ message = new HaveNoneMessage();
+ break;
+
+ case InterestedMessage.MessageId:
+ message = new InterestedMessage();
+ break;
+
+ case NotInterestedMessage.MessageId:
+ message = new NotInterestedMessage();
+ break;
+
+ case PieceMessage.MessageId:
+ message = new PieceMessage(manager);
+ break;
+
+ case PortMessage.MessageId:
+ message = new PortMessage();
+ break;
+
+ case RejectRequestMessage.MessageId:
+ message = new RejectRequestMessage();
+ break;
+
+ case RequestMessage.MessageId:
+ message = new RequestMessage();
+ break;
+
+ case SuggestPieceMessage.MessageId:
+ message = new SuggestPieceMessage();
+ break;
+
+ case UnchokeMessage.MessageId:
+ message = new UnchokeMessage();
+ break;
+
+ case LibtorrentMessage.MessageId:
+ return LibtorrentMessage.DecodeMessage(buffer, offset + 1,
count, manager);
+
+ default:
+ message = new UnknownMessage();
+ break;
+ }
+
+ // 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.Decode(buffer, offset + 1, count);
+ return message;
+ }
+ }
+}
Property changes on:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/PeerMessage.cs
___________________________________________________________________
Name: svn:eol-style
+ native
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/BitfieldMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/BitfieldMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/BitfieldMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -32,12 +32,12 @@
using System.Net;
using MonoTorrent.Common;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
///
/// </summary>
- public class BitfieldMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class BitfieldMessage : PeerMessage
{
public const byte MessageId = 5;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/CancelMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/CancelMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/CancelMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -32,12 +32,12 @@
using System.Net;
using MonoTorrent.Client.Messages;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
///
/// </summary>
- public class CancelMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class CancelMessage : PeerMessage
{
private const int messageLength = 13;
public const byte MessageId = 8;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/ChokeMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/ChokeMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/ChokeMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -31,12 +31,12 @@
using System;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
///
/// </summary>
- public class ChokeMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class ChokeMessage : PeerMessage
{
private const int messageLength = 1;
public const byte MessageId = 0;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HandshakeMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HandshakeMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HandshakeMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -32,12 +32,12 @@
using MonoTorrent.Common;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
///
/// </summary>
- public class HandshakeMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class HandshakeMessage : PeerMessage
{
private readonly static byte[] ZeroedBits = new byte[8];
private const byte ExtendedMessagingFlag = 0x10;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HaveMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HaveMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/HaveMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -31,12 +31,12 @@
using System;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
/// Represents a "Have" message
/// </summary>
- public class HaveMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class HaveMessage : PeerMessage
{
public const byte MessageId = 4;
private const int messageLength = 5;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/InterestedMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/InterestedMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/InterestedMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -31,12 +31,12 @@
using System;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
/// Represents an "Interested" message
/// </summary>
- public class InterestedMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class InterestedMessage : PeerMessage
{
public const byte MessageId = 2;
private const int messageLength = 1;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/KeepAliveMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/KeepAliveMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/KeepAliveMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -30,12 +30,12 @@
using System;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
/// Represents a "KeepAlive" message
/// </summary>
- public class KeepAliveMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class KeepAliveMessage : PeerMessage
{
private const int messageLength = 0; // has no payload
public const byte MessageId = 0;
Deleted:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/MessageBundle.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/MessageBundle.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/MessageBundle.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -1,50 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace MonoTorrent.Client.Messages
-{
- class MessageBundle : PeerMessage
- {
- private List<PeerMessage> messages;
-
- public List<PeerMessage> Messages
- {
- get { return messages; }
- }
-
- public MessageBundle()
- {
- messages = new List<PeerMessage>();
- }
-
- internal override void Handle(PeerIdInternal id)
- {
- throw new InvalidOperationException();
- }
-
- public override int ByteLength
- {
- get
- {
- int total = 0;
- messages.ForEach(delegate(PeerMessage m) { total +=
m.ByteLength; });
- return total;
- }
- }
-
- public override void Decode(byte[] buffer, int offset, int length)
- {
- throw new InvalidOperationException();
- }
-
- public override int Encode(byte[] buffer, int offset)
- {
- int written = offset;
- messages.ForEach(delegate(PeerMessage m) { written +=
m.Encode(buffer, written); });
-
- CheckWritten(written - offset);
- return written - offset;
- }
- }
-}
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/NotInterestedMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/NotInterestedMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/NotInterestedMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -31,12 +31,12 @@
using System;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
/// Represents a "NotInterested" message
/// </summary>
- public class NotInterestedMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class NotInterestedMessage : PeerMessage
{
private const int messageLength = 1;
public const byte MessageId = 3;
Deleted:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PeerMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PeerMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PeerMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -1,99 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Net;
-using MonoTorrent.Client.Messages.PeerMessages;
-
-namespace MonoTorrent.Client.Messages
-{
- public abstract class PeerMessage : Message
- {
- internal abstract void Handle(PeerIdInternal id);
-
- public static PeerMessage DecodeMessage(ArraySegment<byte> buffer, int
offset, int count, TorrentManager manager)
- {
- return DecodeMessage(buffer.Array, buffer.Offset + offset, count,
manager);
- }
-
- public static PeerMessage DecodeMessage(byte[] buffer, int offset, int
count, TorrentManager manager)
- {
- PeerMessage message;
-
- // The first byte tells us what kind of message it is
- switch (buffer[offset])
- {
- case AllowedFastMessage.MessageId:
- message = new AllowedFastMessage();
- break;
-
- case BitfieldMessage.MessageId:
- message = new
BitfieldMessage(manager.Torrent.Pieces.Count);
- break;
-
- case CancelMessage.MessageId:
- message = new CancelMessage();
- break;
-
- case ChokeMessage.MessageId:
- message = new ChokeMessage();
- break;
-
- case HaveAllMessage.MessageId:
- message = new HaveAllMessage();
- break;
-
- case HaveMessage.MessageId:
- message = new HaveMessage();
- break;
-
- case HaveNoneMessage.MessageId:
- message = new HaveNoneMessage();
- break;
-
- case InterestedMessage.MessageId:
- message = new InterestedMessage();
- break;
-
- case NotInterestedMessage.MessageId:
- message = new NotInterestedMessage();
- break;
-
- case PieceMessage.MessageId:
- message = new PieceMessage(manager);
- break;
-
- case PortMessage.MessageId:
- message = new PortMessage();
- break;
-
- case RejectRequestMessage.MessageId:
- message = new RejectRequestMessage();
- break;
-
- case RequestMessage.MessageId:
- message = new RequestMessage();
- break;
-
- case SuggestPieceMessage.MessageId:
- message = new SuggestPieceMessage();
- break;
-
- case UnchokeMessage.MessageId:
- message = new UnchokeMessage();
- break;
-
- case LibtorrentMessage.MessageId:
- return LibtorrentMessage.DecodeMessage(buffer, offset + 1,
count, manager);
-
- default:
- message = new UnknownMessage();
- break;
- }
-
- // 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.Decode(buffer, offset + 1, count);
- 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-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PieceMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -32,12 +32,12 @@
using System.Net;
using MonoTorrent.Common;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
///
/// </summary>
- public class PieceMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class PieceMessage : PeerMessage
{
public const byte MessageId = 7;
private const int messageLength = 9;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PortMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PortMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/PortMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -31,12 +31,12 @@
using System;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
/// Represents a "Port" message
/// </summary>
- public class PortMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class PortMessage : PeerMessage
{
private const int messageLength = 3;
public const byte MessageId = 9;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/RequestMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/RequestMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/RequestMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -30,13 +30,14 @@
using System;
using System.Net;
+using MonoTorrent.Client.Messages.FastPeer;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
/// Represents a "Request" message
/// </summary>
- public class RequestMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class RequestMessage : PeerMessage
{
public const byte MessageId = 6;
private const int messageLength = 13;
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnchokeMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnchokeMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnchokeMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -31,12 +31,12 @@
using System;
using System.Net;
-namespace MonoTorrent.Client.Messages.PeerMessages
+namespace MonoTorrent.Client.Messages.Standard
{
/// <summary>
///
/// </summary>
- public class UnchokeMessage : MonoTorrent.Client.Messages.PeerMessage
+ public class UnchokeMessage : PeerMessage
{
public const byte MessageId = 1;
private const int messageLength = 1;
Deleted:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnknownMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnknownMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/StandardMessages/UnknownMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -1,64 +0,0 @@
-//
-// UnknownMessage.cs
-//
-// Authors:
-// Alan McGovern [EMAIL PROTECTED]
-//
-// Copyright (C) 2006 Alan McGovern
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-
-using System;
-using System.Text;
-using MonoTorrent.Client.Messages;
-
-namespace MonoTorrent.Client.Messages.PeerMessages
-{
- public class UnknownMessage : MonoTorrent.Client.Messages.PeerMessage
- {
- public UnknownMessage()
- {
-
- }
-
- public override int Encode(byte[] buffer, int offset)
- {
- throw new ProtocolException("Unknown message received");
- }
-
- public override void Decode(byte[] buffer, int offset, int length)
- {
- throw new ProtocolException("Unknown message received");
- }
-
- public override int ByteLength
- {
- get { return 0; }
- }
-
- internal override void Handle(PeerIdInternal id)
- {
- throw new ProtocolException("Unknown message received");
- }
- }
-}
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/AnnounceMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/AnnounceMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/AnnounceMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -3,8 +3,9 @@
using System.Text;
using MonoTorrent.Client.Messages;
using MonoTorrent.Common;
+using MonoTorrent.Client.Tracker;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
class AnnounceMessage : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/AnnounceResponseMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/AnnounceResponseMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/AnnounceResponseMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -4,7 +4,7 @@
using MonoTorrent.Client.Messages;
using System.Net;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
class AnnounceResponseMessage : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ConnectMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ConnectMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ConnectMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -4,7 +4,7 @@
using System.Net;
using MonoTorrent.Client.Messages;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
public class ConnectMessage : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ConnectResponseMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ConnectResponseMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ConnectResponseMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -3,7 +3,7 @@
using System.Text;
using System.Net;
using MonoTorrent.Client.Messages;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
class ConnectResponseMessage : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ErrorMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ErrorMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ErrorMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -3,7 +3,7 @@
using System.Text;
using MonoTorrent.Client.Messages;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
class ErrorMessage : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/PeerDetailsMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/PeerDetailsMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/PeerDetailsMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -3,7 +3,7 @@
using System.Text;
using MonoTorrent.Client.Messages;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
class PeerDetailsMessage : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeDetails.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeDetails.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeDetails.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -3,7 +3,7 @@
using System.Text;
using MonoTorrent.Client.Messages;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
class ScrapeDetails : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -3,7 +3,7 @@
using System.Text;
using MonoTorrent.Client.Messages;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
class ScrapeMessage : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeResponseMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeResponseMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/ScrapeResponseMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -3,7 +3,7 @@
using System.Text;
using MonoTorrent.Client.Messages;
-namespace MonoTorrent.Client.Tracker.UdpTrackerMessages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
class ScrapeResponseMessage : UdpTrackerMessage
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/UdpTrackerMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/UdpTrackerMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UdpTrackerMessages/UdpTrackerMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -4,7 +4,7 @@
using MonoTorrent.Client.Tracker.UdpTrackerMessages;
using MonoTorrent.Client.Tracker;
-namespace MonoTorrent.Client.Messages
+namespace MonoTorrent.Client.Messages.UdpTracker
{
public abstract class UdpTrackerMessage : Message
{
Added:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UnknownMessage.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UnknownMessage.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UnknownMessage.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -0,0 +1,64 @@
+//
+// UnknownMessage.cs
+//
+// Authors:
+// Alan McGovern [EMAIL PROTECTED]
+//
+// Copyright (C) 2006 Alan McGovern
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
+
+
+using System;
+using System.Text;
+using MonoTorrent.Client.Messages;
+
+namespace MonoTorrent.Client.Messages
+{
+ public class UnknownMessage : PeerMessage
+ {
+ public UnknownMessage()
+ {
+
+ }
+
+ public override int Encode(byte[] buffer, int offset)
+ {
+ throw new ProtocolException("Unknown message received");
+ }
+
+ public override void Decode(byte[] buffer, int offset, int length)
+ {
+ throw new ProtocolException("Unknown message received");
+ }
+
+ public override int ByteLength
+ {
+ get { return 0; }
+ }
+
+ internal override void Handle(PeerIdInternal id)
+ {
+ throw new ProtocolException("Unknown message received");
+ }
+ }
+}
Property changes on:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Messages/UnknownMessage.cs
___________________________________________________________________
Name: svn:eol-style
+ native
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PeerConnections/PeerConnectionBase.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PeerConnections/PeerConnectionBase.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PeerConnections/PeerConnectionBase.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -36,7 +36,7 @@
using MonoTorrent.Client.Encryption;
using MonoTorrent.Client.Messages;
using MonoTorrent.Client.Connections;
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Libtorrent;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PiecePicking/PiecePickerBase.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PiecePicking/PiecePickerBase.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PiecePicking/PiecePickerBase.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -31,7 +31,8 @@
using System.Collections.Generic;
using System.Text;
using MonoTorrent.Common;
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Standard;
+using MonoTorrent.Client.Messages.FastPeer;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PiecePicking/StandardPicker.cs
===================================================================
---
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PiecePicking/StandardPicker.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/PiecePicking/StandardPicker.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -32,7 +32,8 @@
using System.Text;
using MonoTorrent.Common;
using MonoTorrent.Client.Messages;
-using MonoTorrent.Client.Messages.PeerMessages;
+using MonoTorrent.Client.Messages.Standard;
+using MonoTorrent.Client.Messages.FastPeer;
namespace MonoTorrent.Client
{
Modified:
trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Tracker/UdpTracker.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Tracker/UdpTracker.cs
2008-02-09 01:13:13 UTC (rev 95314)
+++ trunk/bitsharp/src/MonoTorrent/MonoTorrent.Client/Tracker/UdpTracker.cs
2008-02-09 01:21:30 UTC (rev 95315)
@@ -6,6 +6,7 @@
using System.Net.Sockets;
using System.Net;
using MonoTorrent.Client.Messages;
+using MonoTorrent.Client.Messages.UdpTracker;
namespace MonoTorrent.Client.Tracker
{
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
