Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-06 05:14:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merging bugfixes from trunk.

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.4.x@1303 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2009-06-16 21:19:11 +00:00
parent 4854a91822
commit f28b9d3bf5
2 changed files with 70 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

114
libretroshare/src/ft/ftcontroller.cc
View file

@ -23,7 +23,7 @@
* *
*/ */
/* /*
* ftController * ftController
* *
* Top level download controller. * Top level download controller.
@ -56,15 +56,15 @@
*****/ *****/
ftFileControl::ftFileControl() ftFileControl::ftFileControl()
:mTransfer(NULL), mCreator(NULL), :mTransfer(NULL), mCreator(NULL),
mState(0), mSize(0), mFlags(0) mState(0), mSize(0), mFlags(0)
{ {
return; return;
} }
ftFileControl::ftFileControl(std::string fname, ftFileControl::ftFileControl(std::string fname,
std::string tmppath, std::string dest, std::string tmppath, std::string dest,
uint64_t size, std::string hash, uint32_t flags, uint64_t size, std::string hash, uint32_t flags,
ftFileCreator *fc, ftTransferModule *tm, uint32_t cb) ftFileCreator *fc, ftTransferModule *tm, uint32_t cb)
:mName(fname), mCurrentPath(tmppath), mDestination(dest), :mName(fname), mCurrentPath(tmppath), mDestination(dest),
mTransfer(tm), mCreator(fc), mState(0), mHash(hash), mTransfer(tm), mCreator(fc), mState(0), mHash(hash),
@ -134,9 +134,13 @@ void ftController::run()
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
if (it->second.mTransfer) { if (it->second.mTransfer)
(it->second.mTransfer)->tick(); {
#ifdef CONTROL_DEBUG
std::cerr << "\tTicking mTransfer: " << (void*)it->second.mTransfer;
std::cerr << std::endl;
#endif
(it->second.mTransfer)->tick();
//check if a cache file is downloaded, if the case, timeout the transfer after TIMOUT_CACHE_FILE_TRANSFER //check if a cache file is downloaded, if the case, timeout the transfer after TIMOUT_CACHE_FILE_TRANSFER
if ((it->second).mFlags & RS_FILE_HINTS_CACHE) { if ((it->second).mFlags & RS_FILE_HINTS_CACHE) {
@ -157,7 +161,7 @@ void ftController::run()
} }
} }
RsStackMutex stack2(doneMutex); RsStackMutex stack2(doneMutex);
for(it = mDone.begin(); it != mDone.end(); it++) for(it = mDone.begin(); it != mDone.end(); it++)
{ {
completeFile(*it); completeFile(*it);
@ -179,7 +183,7 @@ void ftController::checkDownloadQueue()
bool ftController::FlagFileComplete(std::string hash) bool ftController::FlagFileComplete(std::string hash)
{ {
RsStackMutex stack2(doneMutex); RsStackMutex stack2(doneMutex);
mDone.push_back(hash); mDone.push_back(hash);
std::cerr << "ftController:FlagFileComplete(" << hash << ")"; std::cerr << "ftController:FlagFileComplete(" << hash << ")";
@ -208,7 +212,7 @@ bool ftController::moveFile(const std::string& source,const std::string& dest)
std::cerr << std::endl; std::cerr << std::endl;
std::cerr << "trying copy" << std::endl ; std::cerr << "trying copy" << std::endl ;
//#endif //#endif
// We could not rename, probably because we're dealing with different file systems. // We could not rename, probably because we're dealing with different file systems.
// Let's copy then. // Let's copy then.
std::string error ; std::string error ;
@ -277,7 +281,7 @@ bool ftController::completeFile(std::string hash)
uint32_t callbackCode = 0; uint32_t callbackCode = 0;
{ {
RsStackMutex stack(ctrlMutex); /******* LOCKED ********/ RsStackMutex stack(ctrlMutex); /******* LOCKED ********/
std::cerr << "ftController:completeFile(" << hash << ")"; std::cerr << "ftController:completeFile(" << hash << ")";
@ -312,8 +316,8 @@ bool ftController::completeFile(std::string hash)
ftFileControl *fc = &(it->second); ftFileControl *fc = &(it->second);
// (csoler) I've postponed this to the end of the block because deleting the // (csoler) I've postponed this to the end of the block because deleting the
// element from the map calls the destructor of fc->mTransfer, which // element from the map calls the destructor of fc->mTransfer, which
// makes fc to point to nothing and causes random behavior/crashes. // makes fc to point to nothing and causes random behavior/crashes.
// //
// mDataplex->removeTransferModule(fc->mTransfer->hash()); // mDataplex->removeTransferModule(fc->mTransfer->hash());
@ -321,7 +325,7 @@ bool ftController::completeFile(std::string hash)
/* done - cleanup */ /* done - cleanup */
// (csoler) I'm copying this because "delete fc->mTransfer" deletes the hash string! // (csoler) I'm copying this because "delete fc->mTransfer" deletes the hash string!
std::string hash_to_suppress(fc->mTransfer->hash()); std::string hash_to_suppress(fc->mTransfer->hash());
if (fc->mTransfer) if (fc->mTransfer)
{ {
@ -340,13 +344,13 @@ bool ftController::completeFile(std::string hash)
// I don't know how the size can be zero, but believe me, this happens, // I don't know how the size can be zero, but believe me, this happens,
// and it causes an error on linux because then the file may not even exist. // and it causes an error on linux because then the file may not even exist.
// //
if( fc->mSize > 0 && moveFile(fc->mCurrentPath,fc->mDestination) ) if( fc->mSize > 0 && moveFile(fc->mCurrentPath,fc->mDestination) )
fc->mCurrentPath = fc->mDestination; fc->mCurrentPath = fc->mDestination;
else else
fc->mState = ftFileControl::ERROR_COMPLETION; fc->mState = ftFileControl::ERROR_COMPLETION;
/* switch map */ /* switch map */
if (fc->mFlags & RS_FILE_HINTS_CACHE) /* clean up completed cache files automatically */ if (fc->mFlags & RS_FILE_HINTS_CACHE) /* clean up completed cache files automatically */
{ {
mCompleted[fc->mHash] = *fc; mCompleted[fc->mHash] = *fc;
} }
@ -393,7 +397,7 @@ bool ftController::completeFile(std::string hash)
std::cerr << "ftController::completeFile() doing Callback : Success"; std::cerr << "ftController::completeFile() doing Callback : Success";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
CompletedCache(hash); CompletedCache(hash);
} }
else else
@ -432,7 +436,7 @@ bool ftController::completeFile(std::string hash)
} }
IndicateConfigChanged(); /* completed transfer -> save */ IndicateConfigChanged(); /* completed transfer -> save */
return true; return true;
@ -470,17 +474,17 @@ bool ftController::handleAPendingRequest()
} }
bool ftController::FileRequest(std::string fname, std::string hash, bool ftController::FileRequest(std::string fname, std::string hash,
uint64_t size, std::string dest, uint32_t flags, uint64_t size, std::string dest, uint32_t flags,
std::list<std::string> &srcIds) std::list<std::string> &srcIds)
{ {
/* If file transfer is not enabled .... /* If file transfer is not enabled ....
* save request for later. This will also * save request for later. This will also
* mean that we will have to copy local files, * mean that we will have to copy local files,
* or have a callback which says: local file. * or have a callback which says: local file.
*/ */
{ {
RsStackMutex stack(ctrlMutex); /******* LOCKED ********/ RsStackMutex stack(ctrlMutex); /******* LOCKED ********/
if (!mFtActive) if (!mFtActive)
{ {
@ -520,7 +524,7 @@ bool ftController::FileRequest(std::string fname, std::string hash,
rate = FT_CNTRL_STANDARD_RATE; rate = FT_CNTRL_STANDARD_RATE;
} }
/* First check if the file is already being downloaded.... /* First check if the file is already being downloaded....
* This is important as some guis request duplicate files regularly. * This is important as some guis request duplicate files regularly.
*/ */
@ -559,7 +563,7 @@ bool ftController::FileRequest(std::string fname, std::string hash,
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
(dit->second).mTransfer->addFileSource(*it); (dit->second).mTransfer->addFileSource(*it);
setPeerState(dit->second.mTransfer, *it, setPeerState(dit->second.mTransfer, *it,
rate, mConnMgr->isOnline(*it)); rate, mConnMgr->isOnline(*it));
IndicateConfigChanged(); /* new peer for transfer -> save */ IndicateConfigChanged(); /* new peer for transfer -> save */
@ -597,11 +601,11 @@ bool ftController::FileRequest(std::string fname, std::string hash,
callbackCode = CB_CODE_EXTRA; callbackCode = CB_CODE_EXTRA;
} }
} }
else else
{ {
if (mSearch->search(hash, size, if (mSearch->search(hash, size,
RS_FILE_HINTS_LOCAL | RS_FILE_HINTS_LOCAL |
RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_EXTRA |
RS_FILE_HINTS_SPEC_ONLY, info)) RS_FILE_HINTS_SPEC_ONLY, info))
{ {
/* have it already */ /* have it already */
@ -616,7 +620,7 @@ bool ftController::FileRequest(std::string fname, std::string hash,
} }
/* do a source search - for any extra sources */ /* do a source search - for any extra sources */
if (mSearch->search(hash, size, if (mSearch->search(hash, size,
RS_FILE_HINTS_REMOTE | RS_FILE_HINTS_REMOTE |
RS_FILE_HINTS_SPEC_ONLY, info)) RS_FILE_HINTS_SPEC_ONLY, info))
{ {
@ -640,7 +644,7 @@ bool ftController::FileRequest(std::string fname, std::string hash,
std::cerr << "\tAdding in: " << pit->peerId; std::cerr << "\tAdding in: " << pit->peerId;
std::cerr << std::endl; std::cerr << std::endl;
} }
} }
} }
if (flags & RS_FILE_HINTS_EXTRA) if (flags & RS_FILE_HINTS_EXTRA)
@ -673,12 +677,12 @@ bool ftController::FileRequest(std::string fname, std::string hash,
destination = mDownloadPath + "/" + fname; destination = mDownloadPath + "/" + fname;
} }
} /******* UNLOCKED ********/ } /******* UNLOCKED ********/
ftFileCreator *fc = new ftFileCreator(savepath, size, hash, 0); ftFileCreator *fc = new ftFileCreator(savepath, size, hash, 0);
ftTransferModule *tm = new ftTransferModule(fc, mDataplex,this); ftTransferModule *tm = new ftTransferModule(fc, mDataplex,this);
/* add into maps */ /* add into maps */
ftFileControl ftfc(fname, savepath, destination, ftFileControl ftfc(fname, savepath, destination,
size, hash, flags, fc, tm, callbackCode); size, hash, flags, fc, tm, callbackCode);
ftfc.mCreateTime = time(NULL); ftfc.mCreateTime = time(NULL);
@ -718,7 +722,7 @@ bool ftController::FileRequest(std::string fname, std::string hash,
} }
bool ftController::setPeerState(ftTransferModule *tm, std::string id, bool ftController::setPeerState(ftTransferModule *tm, std::string id,
uint32_t maxrate, bool online) uint32_t maxrate, bool online)
{ {
if (id == mConnMgr->getOwnId()) if (id == mConnMgr->getOwnId())
@ -867,7 +871,7 @@ bool ftController::FileClearCompleted()
std::cerr << "ftController::FileClearCompleted()" <<std::endl; std::cerr << "ftController::FileClearCompleted()" <<std::endl;
#endif #endif
mCompleted.clear(); mCompleted.clear();
IndicateConfigChanged(); IndicateConfigChanged();
return false; return false;
} }
@ -906,6 +910,7 @@ bool ftController::setDownloadDirectory(std::string path)
std::cerr << "ftController::setDownloadDirectory() Okay!"; std::cerr << "ftController::setDownloadDirectory() Okay!";
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
IndicateConfigChanged();
return true; return true;
} }
@ -920,6 +925,24 @@ bool ftController::setPartialsDirectory(std::string path)
{ {
/* check it is not a subdir of download / shared directories (BAD) - TODO */ /* check it is not a subdir of download / shared directories (BAD) - TODO */
{
RsStackMutex stack(ctrlMutex);
if (!path.find(mDownloadPath)) {
return false;
}
if (rsFiles) {
std::list<std::string>::iterator it;
std::list<std::string> dirs;
rsFiles->getSharedDirectories(dirs);
for (it = dirs.begin(); it != dirs.end(); it++) {
if (!path.find(*it)) {
return false;
}
}
}
}
/* check if it exists */ /* check if it exists */
@ -937,6 +960,7 @@ bool ftController::setPartialsDirectory(std::string path)
(it->second).mCreator->changePartialDirectory(mPartialPath); (it->second).mCreator->changePartialDirectory(mPartialPath);
} }
#endif #endif
IndicateConfigChanged();
return true; return true;
} }
@ -970,7 +994,7 @@ bool ftController::FileDetails(std::string hash, FileInfo &info)
it = mCompleted.find(hash); it = mCompleted.find(hash);
if (it == mCompleted.end()) if (it == mCompleted.end())
{ {
/* Note: mTransfer & mCreator /* Note: mTransfer & mCreator
* are both NULL * are both NULL
*/ */
return false; return false;
@ -1046,7 +1070,7 @@ bool ftController::FileDetails(std::string hash, FileInfo &info)
{ {
info.downloadStatus = FT_STATE_FAILED; info.downloadStatus = FT_STATE_FAILED;
} }
else else
{ {
info.downloadStatus = FT_STATE_WAITING; info.downloadStatus = FT_STATE_WAITING;
} }
@ -1146,7 +1170,7 @@ bool ftController::RequestCacheFile(RsPeerId id, std::string path, std::string h
std::list<std::string> ids; std::list<std::string> ids;
ids.push_back(id); ids.push_back(id);
FileRequest(hash, hash, size, path, FileRequest(hash, hash, size, path,
RS_FILE_HINTS_CACHE | RS_FILE_HINTS_NO_SEARCH, ids); RS_FILE_HINTS_CACHE | RS_FILE_HINTS_NO_SEARCH, ids);
return true; return true;
@ -1252,7 +1276,7 @@ std::list<RsItem *> ftController::saveList(bool &cleanup)
/* what data is important? */ /* what data is important? */
rft->file.name = fit->second.mName; rft->file.name = fit->second.mName;
rft->file.hash = fit->second.mHash; rft->file.hash = fit->second.mHash;
rft->file.filesize = fit->second.mSize; rft->file.filesize = fit->second.mSize;
rft->file.path = RsDirUtil::removeTopDir(fit->second.mDestination); /* remove fname */ rft->file.path = RsDirUtil::removeTopDir(fit->second.mDestination); /* remove fname */
//rft->flags = fit->second.mFlags; //rft->flags = fit->second.mFlags;
@ -1274,7 +1298,7 @@ bool ftController::loadList(std::list<RsItem *> load)
RsConfigKeyValueSet *rskv; RsConfigKeyValueSet *rskv;
RsFileTransfer *rsft; RsFileTransfer *rsft;
#ifdef CONTROL_DEBUG #ifdef CONTROL_DEBUG
std::cerr << "ftController::loadList() Item Count: " << load.size(); std::cerr << "ftController::loadList() Item Count: " << load.size();
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
@ -1297,15 +1321,15 @@ bool ftController::loadList(std::list<RsItem *> load)
} }
else if (NULL != (rsft = dynamic_cast<RsFileTransfer *>(*it))) else if (NULL != (rsft = dynamic_cast<RsFileTransfer *>(*it)))
{ {
// csoler: I'm suppressing this lock since there is a double lock below // csoler: I'm suppressing this lock since there is a double lock below
// in FileRequest, line 382. // in FileRequest, line 382.
// RsStackMutex stack(ctrlMutex); /******* LOCKED ********/ // RsStackMutex stack(ctrlMutex); /******* LOCKED ********/
// //
/* This will get stored on a waiting list - until the /* This will get stored on a waiting list - until the
* config files are fully loaded * config files are fully loaded
*/ */
FileRequest(rsft->file.name, rsft->file.hash, rsft->file.filesize, FileRequest(rsft->file.name, rsft->file.hash, rsft->file.filesize,
rsft->file.path, 0, rsft->allPeerIds.ids); rsft->file.path, 0, rsft->allPeerIds.ids);
} }
@ -1332,7 +1356,7 @@ bool ftController::loadConfigMap(std::map<std::string, std::string> &configMap)
if (configMap.end() != (mit = configMap.find(partial_dir_ss))) if (configMap.end() != (mit = configMap.find(partial_dir_ss)))
{ {
//setPartialsDirectory(mit->second); setPartialsDirectory(mit->second);
} }
return true; return true;

1
libretroshare/src/ft/ftextralist.cc
View file

@ -437,6 +437,7 @@ bool ftExtraList::loadList(std::list<RsItem *> load)
/* to old */ /* to old */
cleanupEntry(fi->file.path, fi->flags); cleanupEntry(fi->file.path, fi->flags);
delete (*it); delete (*it);
continue ;
} }
/* add into system */ /* add into system */