Changeset 507

Timestamp:

04/06/07 20:02:45 (17 months ago)

Author:

hyriand

Message:

Auto-retry failed downloads a couple of times.

Location:

museek+/trunk/sources/Museek

Files:

• PeerConnection.cc (modified) (1 diff)
• TransferManager.cc (modified) (4 diffs)
• TransferManager.hh (modified) (2 diffs)

museek+/trunk/sources/Museek/PeerConnection.cc

@@ -345 +345 @@
                 PARSE(PUploadFailed);
                 DEBUG("got Upload Failed from %s, %s", mUser.c_str(), s.filename.c_str());
+                Transfer *transfer = mPeer->download(mMuseek->recoder()->decode_user(mUser, s.filename));
+                if(! transfer) {
+                        DEBUG("couldn't find transfer %s, %s", mUser.c_str(), s.filename.c_str());
+                        break;
+                } if((transfer->state() != TS_Queued) || (! transfer->auto_retry()))
+                        transfer->set_error("Upload failed");
+                else
+                        DEBUG("Retrying download");
                 break;
         }

museek+/trunk/sources/Museek/TransferManager.cc

@@ -233 +233 @@
 Transfer::Transfer(TransferManager* manager, Direction direction, Peer* peer, const wstring& path, const wstring& local_path, const wstring& temp_path, off_t size)
          : mManager(manager), mDirection(direction), mTicketValid(false), mPeer(peer), mPath(path), mLocalPath(local_path), mTempPath(temp_path),
-           mState((direction == Download) ? TS_Offline : TS_Queued), mSize(size), mPos(0), mRate(0), mPlaceInQueue((uint32)-1),
+           mState((direction == Download) ? TS_Offline : TS_Queued), mSize(size), mPos(0), mRate(0), mPlaceInQueue((uint32)-1), mAutoRetries(0),
            mConnection(0), mFD(-1), mCollected(0) {
         CT("transfer %s, %s", peer->user().c_str(), path.c_str());
@@ -278 +278 @@
         mPeer->remove_transfer(this);
         mPeer->add_transfer(this);
+}
+
+bool Transfer::auto_retry() {
+        if(mAutoRetries > 3)
+                return false;
+        ++mAutoRetries;
+        retry();
+        return true;
 }
 
@@ -343 +351 @@
                 if(mPeer->uploading() == this)
                         mPeer->set_uploading(0);
-
+                
+                break;
+        
+        case TS_Transferring:
+                mAutoRetries = 0;
+                break;
+        
         default: ;
         }
@@ -349 +363 @@
         mState = state;
         mManager->museek()->cb_transfer_update(this);
+
+        if(mDirection == Download && mState == TS_ConnectionClosed)
+        {
+                DEBUG("connection closed by peer, automatically retrying");
+                auto_retry();
+        }
 }
 

museek+/trunk/sources/Museek/TransferManager.hh

@@ -47 +47 @@
         
         void retry();
+        bool auto_retry();
         
         inline bool ticket_valid() const { return mTicketValid; };
@@ -115 +116 @@
         uint32 mRate, mPlaceInQueue;
         std::vector<uint32> mRatePool;
+        int mAutoRetries;
         
         BaseConnection* mConnection;