Commit Graph

504 Commits

Author SHA1 Message Date
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
csoler
80a8b41d66 Added a display for file hashing activity using notifyQt class. This time it works nicely.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@938 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-22 21:06:54 +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
812cdd6bd6 time out unused uploads
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-18 04:00:24 +00:00
csoler
6d6901e6e9 added a callback to fimonitor to be able to keep track of file hashing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@909 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-01-04 20:28:48 +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
b3a0d30bbc Small fix to universal script and some extra debugging.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-12-07 17:51:11 +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
drbob
f5fa2f9a68 Added Function to move an 'extraFile' to another location.
This will be used to retrieve channel files.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-27 21:23:46 +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
83720439f0 Updated version numbers to v0.4.11b.
Bugfixes for 'sleep' issues under windows.
 Extra debugging for transfer module.
 Fixed channel directory creation. (extra 'break' statement)
 Fixed very slow transfers on Windows platform (uninitialised variable)
 Ready for win/linux/osx release now.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@830 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-22 17:07:11 +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
71797d6f70 Fixed compatibility bug in file transfer...
can now communicate between V0.4.9b and V0.4.11+



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-20 22:59:58 +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
c60cf84e95 * Switched off lots of debugging.
* Tweaks to the transfer rates.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-18 21:22:58 +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
stockpicker
db263b160c Fixes missing includes and strict gcc 4 code checks for Linux
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-02 13:53:17 +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
e8d21abdd5 ftFileStatus contruct failure
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@726 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-10 14:12:13 +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
86ffedb50d small updates for fttransfermodule.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-09-09 07:24:06 +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
ewensun
059effcfac add draft code to test ftcontroller and fttransfermodule
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-28 14:20:53 +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
33032e8a83 * Modified p3ConnectMgr to enable Standalone testing of components.
* Created pqiNetAssist interfaces for DHT and UPnP.
 * Created PQIHub etc for standalone testing (in ft/pqitestor.h for now).
 * Add basics of first server test ... its not quite complete yet.
 * Improvements to ftserver.
 * Changes to many tests to match other mods.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@689 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-16 15:02:24 +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
ewensun
6f1a6e78cc fill adjustSpeed and recvFileData
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@664 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-06 04:12:36 +00:00
drbob
5c6e558942 More Improvements to FileTransfer:
* Added TlvShallowClear() to serialisers
 * Added RsQueueThread for periodic queue processes.
 * Completed ftDataMultiplex which replaces ftServer/ClientModules.
 * Added Server Queue / Thread to ftDataMultiplex.
 * Added ftdataplextest to exercise ftDataMultiplex.
 * Generalised ftFileSearch to handle an array of ftSearch classes.
 * Tweaked rsfiles.h #defines to match new ftFileSearch scheme.
 * Added Generic ftData Interfaces for Testing.
 * added ftDataSend/Recv Interfaces to ftServer + ftDataMultiplex respectively.
 * Completed much of ftServer (External Interface), but not yet done.
 * Extra debugging and small changes to ftExtraList
 * Integrated new ftTransferModule with minor interface changes.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-03 12:45:53 +00:00
ewensun
9a4fc54943 draft version for implementation of transfer module.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@652 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-29 15:18:27 +00:00
ewensun
3bcb97ff4c update according to Bob's comments.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@651 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-29 15:16:31 +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
ewensun
e0b8a14e0b git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@632 b45a01b8-16f6-495d-af2f-9b41ad6348cc 2008-07-03 13:11:20 +00:00
drbob
be392405e8 * Switched to rsFiles interface for all File Information.
* added TMP p3Files class to interface with old system.
 * cleaned up old RsControl + RsIface file information.
 * removed unnecessary functions from RsServer.
 * Tweaked interfaces for ftServer + ftExtraList.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@630 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-02 16:58:13 +00:00
drbob
473f3f75f3 * Addition of new File Transfer structure. (server / search / extralist / controller)
* Fixed up variable names in p3Qblog.cc
 * Cleaned up unused BaseInfo/PersonInfo/DirInfo in rstypes/rsiface
 * added new rsfiles interface (rough outline at the moment)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@628 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-02 13:19:59 +00:00
cppenthu
eeb13e7b18 Corrected formatting
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@627 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-02 04:05:58 +00:00
cppenthu
1db82dee51 ftfileprovider.cc - takes care of getting data from a requested file
ftfilecreator.cc -- creates a file, tracks missing chunks, timed out 
chunks etc



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-07-02 02:36:39 +00:00
drbob
971ad4fe9b Added header files for new file transfer design.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@615 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-19 22:49:23 +00:00