diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-05-20 15:22:50 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-05-20 15:22:50 +0000 |
| commit | ad7078db28a19c5206bd7c9a2d9c00c725b40354 (patch) | |
| tree | 41dce05bf4f0c80171ad7409e22ab21bff830bec /src/PeerInitiateConnectionCommand.cc | |
| parent | f3995b1f7ebb2d659fc1c6b1561f15e79741d5fa (diff) | |
Use CUIDCounter instead of BtRuntime::getNewCuid():
* src/ActivePeerConnectionCommand.cc
* src/PeerInteractionCommand.cc
* src/BtRuntime.h
(cuidCounter): Removed.
(getNewCuid): Removed.
* src/DownloadEngineFactory.cc
* src/PeerListenCommand.cc
* src/TrackerUpdateCommand.cc
* src/PeerInitiateConnectionCommand.cc
Use CUIDCounter instead of BtRuntime::getNewCuid():
* src/ActivePeerConnectionCommand.cc
* src/PeerInteractionCommand.cc
* src/BtRuntime.h
(cuidCounter): Removed.
(getNewCuid): Removed.
* src/DownloadEngineFactory.cc
* src/PeerListenCommand.cc
* src/TrackerUpdateCommand.cc
* src/PeerInitiateConnectionCommand.cc
Diffstat (limited to 'src/PeerInitiateConnectionCommand.cc')
| -rw-r--r-- | src/PeerInitiateConnectionCommand.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/PeerInitiateConnectionCommand.cc b/src/PeerInitiateConnectionCommand.cc index 399cfb1e..8ada7e3f 100644 --- a/src/PeerInitiateConnectionCommand.cc +++ b/src/PeerInitiateConnectionCommand.cc @@ -38,6 +38,7 @@ #include "DlAbortEx.h" #include "message.h" #include "prefs.h" +#include "CUIDCounter.h" PeerInitiateConnectionCommand::PeerInitiateConnectionCommand(int cuid, const PeerHandle& peer, @@ -68,10 +69,9 @@ bool PeerInitiateConnectionCommand::executeInternal() { bool PeerInitiateConnectionCommand::prepareForNextPeer(int wait) { if(peerStorage->isPeerAvailable() && btRuntime->lessThanEqMinPeer()) { PeerHandle peer = peerStorage->getUnusedPeer(); - int newCuid = btRuntime->getNewCuid(); - peer->cuid = newCuid; + peer->cuid = CUIDCounterSingletonHolder::instance()->newID(); PeerInitiateConnectionCommand* command = - new PeerInitiateConnectionCommand(newCuid, + new PeerInitiateConnectionCommand(peer->cuid, peer, e, btContext); |
