Author: alanmc
Date: 2007-05-24 11:49:58 -0400 (Thu, 24 May 2007)
New Revision: 77915
Modified:
trunk/bitsharp/src/MonoTorrent/Makefile
trunk/bitsharp/src/MonoTorrent/Tracker/PeerManager.cs
trunk/bitsharp/src/MonoTorrent/Tracker/SimpleTorrentManager.cs
Log:
Flush again
Modified: trunk/bitsharp/src/MonoTorrent/Makefile
===================================================================
--- trunk/bitsharp/src/MonoTorrent/Makefile 2007-05-24 15:36:47 UTC (rev
77914)
+++ trunk/bitsharp/src/MonoTorrent/Makefile 2007-05-24 15:49:58 UTC (rev
77915)
@@ -6,6 +6,21 @@
EXTRA_DIST = AssemblyInfo.cs.in
SOURCES= \
+ Collections/BlockCollection.cs \
+ Collections/BEncodedKeyValuePair.cs \
+ Collections/IBEncodedValueCollection.cs \
+ Collections/IntCollection.cs \
+ Collections/ITorrentWatcherCollection.cs \
+ Collections/MonoTorrentCollectionBase.cs \
+ Collections/PeerCollection.cs \
+ Collections/PeerConnectionIDCollection.cs \
+ Collections/PieceCollection.cs \
+ Collections/StringCollection.cs \
+ Collections/TorrentManagerCollection.cs \
+ Collections/TraceListenerCollection.cs \
+ Collections/TrackerCollection.cs \
+ Collections/UInt32Collection.cs \
+ Collections/WaitHandleCollection.cs \
Common/Enums.cs \
Common/Hashes.cs \
Common/Peer.cs \
@@ -28,7 +43,6 @@
Client/ConnectionListener.cs \
Client/Logger.cs \
Client/PeerList.cs \
- Client/PortMapper.cs \
Client/RateLimiter.cs \
Client/ReaderLock.cs \
Client/MessageHandler.cs \
@@ -100,7 +114,6 @@
Client/TrackerConnectionId.cs \
Client/AllowedFastAlgorithm.cs \
Client/Tracker.cs \
- BEncoding/BEncode.cs \
BEncoding/BEncodedDictionary.cs \
BEncoding/BEncodedList.cs \
BEncoding/BEncodedNumber.cs \
Modified: trunk/bitsharp/src/MonoTorrent/Tracker/PeerManager.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/Tracker/PeerManager.cs 2007-05-24
15:36:47 UTC (rev 77914)
+++ trunk/bitsharp/src/MonoTorrent/Tracker/PeerManager.cs 2007-05-24
15:49:58 UTC (rev 77915)
@@ -37,12 +37,12 @@
///</summary>
public class PeerManager
{
- PeerCollection peer_list;//same as _peers but no indexed. used for
index based peer retrieval for randomization
+ List<MonoTorrent.Tracker.Peer> peer_list;//same as _peers but no
indexed. used for index based peer retrieval for randomization
Dictionary<string, Peer> peer_dict;//hold the list of peers attatched
to this torrent
public PeerManager()
{
- peer_list = new PeerCollection();
+ peer_list = new List<MonoTorrent.Tracker.Peer>();
peer_dict = new Dictionary<string, Peer>();
}
@@ -54,7 +54,7 @@
}
///</summary>Adds p to this Manager.</summary>
- public void Add(Peer peer)
+ public void Add(MonoTorrent.Tracker.Peer peer)
{
lock (this) {
peer_dict.Add(peer.Key, peer);
@@ -96,9 +96,9 @@
///</summary>
///<param name=exclude>do not include this peer in the resulting
list.</parm>
///<param name=count>return at most count peers</param>
- public PeerCollection GetRandomPeers(int count, Peer exclude)
+ public List<Peer> GetRandomPeers(int count, Peer exclude)
{
- PeerCollection randomPeers = new PeerCollection(count);
+ List<Peer> randomPeers = new List<Peer>(count);
if (peer_list.Count == 0) {
return randomPeers;
}
@@ -127,9 +127,9 @@
}
///<summary>returns all peers from this Manager but not
exlcude</summary>
- private PeerCollection GetAllPeers(Peer exclude)
+ private List<Peer> GetAllPeers(Peer exclude)
{
- PeerCollection randomPeers = new PeerCollection(peer_list.Count);
+ List<Peer> randomPeers = new List<Peer>(peer_list.Count);
foreach(Peer p in peer_list) {
if (exclude != null && !exclude.Equals(p)) {
randomPeers.Add(p);
Modified: trunk/bitsharp/src/MonoTorrent/Tracker/SimpleTorrentManager.cs
===================================================================
--- trunk/bitsharp/src/MonoTorrent/Tracker/SimpleTorrentManager.cs
2007-05-24 15:36:47 UTC (rev 77914)
+++ trunk/bitsharp/src/MonoTorrent/Tracker/SimpleTorrentManager.cs
2007-05-24 15:49:58 UTC (rev 77915)
@@ -156,7 +156,7 @@
if (peers.Contains(Peer.GetKey(par))) {
exclude = peers.Get(Peer.GetKey(par));
}
- PeerCollection randomPeers =
peers.GetRandomPeers(par.numberWanted, exclude);
+ List<Peer> randomPeers = peers.GetRandomPeers(par.numberWanted,
exclude);
byte[] peersBuffer = new byte[randomPeers.Count * 6];
int offset = 0;
Debug.WriteLine("number of peers returned: " + randomPeers.Count);
@@ -175,7 +175,7 @@
private BEncodedValue GetNonCompactList(AnnounceParameters par)
{
Peer exclude = peers.Get(Peer.GetKey(par));
- PeerCollection randomPeers =
peers.GetRandomPeers(par.numberWanted, exclude);
+ List<Peer> randomPeers = peers.GetRandomPeers(par.numberWanted,
exclude);
BEncodedList announceList = new BEncodedList(randomPeers.Count);
foreach (Peer each in randomPeers) {
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
