Commit Graph

46 Commits

Author SHA1 Message Date
csoler
fc6a86b592 forgot to commit this one.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1488 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-04 09:19:32 +00:00
alexandrut
3394239297 let hash name for partial files, use qfile link instead
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1448 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-28 15:29:21 +00:00
alexandrut
e7b42238cb use real name instead hash name for partials for preview; hope to work now
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1400 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-21 21:37:51 +00:00
alexandrut
f98d4f080b added extension for file names in partial dir, so them can be previewed in windows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-18 12:23:34 +00:00
alexandrut
990ed277bd share of incoming directory by default
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1359 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-12 13:22:31 +00:00
csoler
51eb8b8eaf added removal of turtle handling when canceling/ending a file transfer. next step: Turtle download is now ready for gui integration
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1299 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-14 19:34:22 +00:00
alexandrut
9b7d486d6c bug fixing when storing incoming and partials directory
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1296 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-11 21:41:42 +00:00
csoler
48218e98cb turtle tunnel management
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-06-03 18:47:14 +00:00
csoler
1046bdd846 First commit for the turtle download. It works without perturbating RS traffic, but still needs some (internal) smoothing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1275 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-26 21:42:45 +00:00
joss17
ec072e53f4 add include complying to gcc 4.4
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1217 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-11 14:30:53 +00:00
joss17
e34173759e timeout on fil index cache transfer \n Set fileIndex cache transfer timeout to 300sec \n Remove the downloads item for file index cache transfer
Merge branch 'fiIndexCacheTransfertImprove'


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-05-06 20:48:32 +00:00
csoler
1ff00dcf07 it happens sometimes that files of size 0 are transfered. In such a case the destination file is not written down, and the following calls to moveFile in ftcontroller.cc produce an error. Ive put an if to avoid this.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1117 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-04-06 19:41:40 +00:00
csoler
ef54d9d176 win32 compatibility
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1095 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-23 14:45:51 +00:00
csoler
12113df4b7 fixed file moving between different file systems, which forced people to have their Incoming directory on the same file system than the Partials directory
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1087 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-03-19 12:49:11 +00:00
csoler
acaa10d54f suppressed an initialized memory read. It happens below, but this limits its impact above.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1039 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-02-12 12:47:57 +00:00
csoler
3012683143 Corrected two nasty bugs in file transfer which caused random core dumps (at least on ubuntu 32 and 64 bits)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@957 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-26 18:55:33 +00:00
csoler
ed0fbb1fd7 regression of ft/ftcontroler.{h,cc} to svn=932 because the 933 commit (download queue) causes a large scope bug.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-24 15:22:08 +00:00
ewensun
0654836a3d add a downloading queue in ftControl,max 2 files can be download at same time
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@933 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-19 15:02:59 +00:00
ewensun
6919d3bd7f clean up completed cache files automatically
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-18 14:27:22 +00:00
csoler
5a1757c5d9 Invalid read correction (valgrind)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-11 21:12:53 +00:00
drbob
d89eda510f * switched off some debugging.
* fixed tickrate slow down (when no activity)
 * added extra flags to interface.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-07 14:53:57 +00:00
ewensun
889ad3555b implement function for clearCompleted on filetransfer panel
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@866 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-04 21:34:19 +00:00
ewensun
3453604c4d remove temporary file when cancel file transfer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-30 21:43:51 +00:00
drbob
9f727e2d94 Bugfixes for correct Channels display.
* Corrected search in ftserver.
 * Updated avail in controller FileDetails.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-30 17:17:28 +00:00
ewensun
00a0fdfbbf add code for cancen file transfer
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@854 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-29 22:03:36 +00:00
csoler
d19f696278 suppressed double mutex lock
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@840 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-24 20:13:16 +00:00
drbob
c46b823261 * fixed, transfer start when subscribing to channel.
* cleaned up p3distrib callbacks.
 * added holdQueue for transfer startup in controller. 
 * fixed partial resume.
 * updated Mac script to only build library.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-21 00:10:59 +00:00
drbob
7c596231e1 Improvements to the file transfer algorithm.
Increased max individual file speed to 1MB/s



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-19 01:12:21 +00:00
drbob
66bf56207d * Added Configurations to new file transfer.
* Enabled config in p3file-startup.cc
 * Enabled resumeTransfers
 * Added new RsFileConfigItem to serialiser.
 * extended ftFiMonitor to use Configuration.
 * bug fix to add/remove Shared Dirs.
 * Increased Channel/forum periods to 3/12 months.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-15 20:00:29 +00:00
drbob
fce83cb232 More bugfixes ... got the basic channels file transfer working.
* Create channels directory correctly.
 * added File Transfers to Config List.
 * connected statusChange() monitor callback.
 * fixed file sources in transfermodule.
 * fixed up transfer restarts / sleeps.
 * enabled opening files read only.
 * disabled some of the debug.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-13 23:03:46 +00:00
drbob
aee6cb85b4 * More bugfixes for file transfer.
* Added File Transfer / ExtraList to channels.
 * fixed mutex deadlock.
 * added slow transfer for background tf.
 * added checks to FileRequest to accumulate peers.
 * added ExtraList callback.
 * etc, etc.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-09 22:17:20 +00:00
drbob
80f4686100 Bugfixes and extra debugging for file transfer.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@791 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-04 23:12:53 +00:00
drbob
0d96b43d34 Enabled new File Transfer Code in libretroshare.
NB: This is not yet working. so SVN is now officially broken :(
Hope to have the bugs ironed out soon.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-02 11:38:11 +00:00
drbob
88ef2e0e34 Major bugfixes and testing changes for ft.
It is now almost ready for integration with rs.

Added ftserver3test.cc which successfully tests:
	* Hashing of a directory.
	* Transfer of Cache Files.
	* Local Searching.
	* Remote Searching.
	* Download from multiple sources.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-29 20:58:23 +00:00
drbob
ef9bb372b4 re-wrote ftfileprovider / ftfilecreator to be more simple and robust.
re-wrote associated tests to be more robust.
added new fttransfermoduletest.cc 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-10-22 18:12:58 +00:00
ewensun
cc41cbb708 roll back to 725
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-11 10:33:43 +00:00
ewensun
3af7d41d7f solve compile faults.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@725 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-09 13:08:22 +00:00
ewensun
7b609a6aea implement cancelTransfer and update transfer module for debug log
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-08 14:04:10 +00:00
ewensun
9b0bfb26c2 add fileControl and fileCancel code in ftController
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-08 08:44:37 +00:00
drbob
f7fca4295b Improvements/bugfixes to File Transfer.
* Lots more debugging messages.
 * Fixed Sleep / sleep issue on windows.
 * added pthread / WSAStartup.
 * added ownId to ftDataMultiplex for loopback file transfer.
 * now start ftDataMultiplex thread.
 * several bugfixes in ftfilecreator



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@710 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-30 01:07:24 +00:00
drbob
d62876ae37 * fixes for windows
* corrected allocation in ftfilecreator



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@707 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-25 20:03:39 +00:00
drbob
f243e5f6d3 * Added lots of debugging.
* Partial bug fix for allocate algorithms.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-23 21:28:08 +00:00
drbob
7b7446c5b5 More bugfixes for file transfer stuff.
* Completed 2 basic tests (ftserver1test & ftserver2test)
 * Updated test notes.
 * debugging stderr output. 
 * fixed return code in ftfilesearch.cc
 * corrected ftcontroller run() to call fttransfermodule::tick()
 * fixed ONLINE status for OwnId (ftcontroller too)
 * corrected message sources for test harness.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-21 21:30:59 +00:00
drbob
eb8dacc798 Integration of ft into a working system.
* Made ftTransferModule compile.
 * bugfixes to make ftserver1test work.
 * New P3Pipe / P3Hub ...
 * Added Test Notes.
 * First functions added to ftcontroller
 * added isOnline to p3ConnectMgr.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@698 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-17 15:23:11 +00:00
drbob
189dcbb482 Completed most of ftserver class.
Also changes to make everything fit together.
changes to Interface to support srcId list.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@675 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-09 17:03:24 +00:00
drbob
79727897dd Addition of next stage of new FileTransfer Code:
* Completed rough ftExtraList class (with Test Case)
 * Added data flow interface (ftData.h)
 * Added ftDataMultiplex (server + client modules).
 * Finished parts of ftcontroller / ftserver.
 * Minor Tweaks to ftTransferModules interface for compilation.
Related Changes in other parts of the code:
 * Added new Job/Queue Thread Class.
 * Added more user-friendly directory functions.
 * Added FileInfo print operator.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@650 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-23 22:01:59 +00:00