Commit Graph

145 Commits

Author SHA1 Message Date
drbob
9e091c16b6 from retroshare/code/branches/v0.5-rpc-b1
-- Merging r6107 through r6332 into 'libretroshare':



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6334 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-23 21:05:55 +00:00
csoler
6121e613eb removed compilation warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6258 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-20 20:25:13 +00:00
csoler
bc65dd40c2 - Restored compilation of most tests (The part using previously named p3ConnectMgr is still to be done).
- moved ftSearchDummy and ftDataSendPair in tests/ft since it is only used there.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6009 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-17 23:05:25 +00:00
drbob
069b72e0b2 Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995)
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 19:17:11 +00:00
csoler
58dff54b3e remove debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5965 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-10 22:29:03 +00:00
csoler
2f7b7c4366 use a std::map to search file hashes instead of sweeping the entire database (ouch)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-10 22:25:57 +00:00
csoler
e3da77612a - Added flags for services and service permissions for peers
Flags are identity-related, meaning that all locations of the same peers have the same flags.
- It's now possible to tweak which services each peer can use. Service that can be disabled are
  forums/channels, discovery, anonymous routing.
- by default, peers have all flags on.
- fixed missing error msg in p3cfgmgr when serialisation fails.
- fixed bug in RemoteDirModel causing infinite loop to happen when group name is unknown




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-01 19:22:22 +00:00
csoler
e6563eba52 removed debug output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5846 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-19 21:28:12 +00:00
csoler
454daf1981 Iproved file list handling:
- Implemented correct cacheData send to clients usign constant subid value.
- At start, the association between peers and available file list is always recomputed
- overloaded cacheAvailable() and refreshCache() in FileIndexMonitor
- added callback in rsFiles to force re-generating cache items when group layout has changed
- force re-sent file lists when moving peers between groups in the GUI
(Fixes group leaking problem) Needs full recompilation of libretroshare.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-12 22:51:27 +00:00
csoler
a2f958b956 disabled flag DIR_FLAGS_NETWORK_WIDE_GROUPS for consistency reasons. We might extend it to rsCircles later.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-06 20:46:56 +00:00
csoler
997e833cc8 debugging tunnel handlign with permissions
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-04 14:52:38 +00:00
csoler
6b6f961e94 added contextual message to explain current group sharing permissions
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 17:15:47 +00:00
csoler
d77c73adf4 loading/saving parent groups for directories.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 15:25:25 +00:00
csoler
bd37e78884 debugged search functions
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-02 14:25:35 +00:00
csoler
e753f22909 fixed flags conflicts
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-02 13:52:29 +00:00
csoler
dc82cee700 First shot of file sharing permissions. Compiles, but needs some testing/debugging.
- added type-safe flags in retroshare/rsflags.h. This should be used to make new flags types in order to prevent mixing flags up in function prototypes.
- group handling is left to rsPeers. We'll move it to rsCircles later.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-01 10:06:12 +00:00
thunder2
78edc7687e Fixed compile of libretroshare on Windows. The corrected pro files are not included.
Moved the includes of rswin.h from the header files to the c files.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5655 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-09 23:07:51 +00:00
drbob
bec1407648 Merged Code from: /branches/v0.5-new_cache_system/ into main trunk.
- Revisions 4771 => 5334

 * This merge brings a lot of unfinished code for GXS (new cache system)
 	- See branch commits for more details.
 * Code is disabled, and should have minimal effect on trunk build.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-07-27 15:03:16 +00:00
chrisparker126
50a0ed0656 libretroshare src now compilable.
nxsitems not tested yet
renamed retrodb src file to .cc regular librs naming convention
wrote deserialisation section of nxsitems, need to write print and clear rsitem base functions

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5144 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-05 19:55:24 +00:00
thunder2
3718d6ecfa Removed usages of "std::istringstream" and "std::stringstream".
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5135 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-03 13:41:03 +00:00
thunder2
a6dfac2a37 Removed std::stringstream.
Removed not necessary include <sstream>.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5112 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-19 22:10:00 +00:00
thunder2
33f4d4f2b8 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5105 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-16 17:47:53 +00:00
thunder2
d765721e83 Modified some defaults:
- set auto check of shared directories to 15 minutes
- set time to idle mode to 5 minutes
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-20 21:05:59 +00:00
drbob
df741f7c64 Added check in cachestrapper to see if a duplicate cache has been requested.
In this case, don't cancel the old one - just keep going!

This should fix the issues associated with cache restarts and frequent peer disconnects.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-17 22:01:04 +00:00
csoler
bd9cd22387 added RequestDirDetails(path,...) for file sync plugin.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-17 20:38:25 +00:00
csoler
379927a846 corrected disabled RequestdirDetails in FileIndexStore to be able to retrieve root directory of a user ID
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4683 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-23 16:05:57 +00:00
csoler
ded1707151 improved behavior of hash cache
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4663 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-11-05 22:31:45 +00:00
csoler
a48dc86fb8 removed delay in file checking that would cause excessively long file update cycle
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-10-24 16:11:12 +00:00
thunder2
363af69254 Fixed utf8 issue in history manager.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4626 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-10-01 13:12:28 +00:00
csoler
9b5928453d stopping hash when the top directory is removed
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4607 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-09-15 21:22:34 +00:00
thunder2
c6beee44ec Removed unused parameter warnings in libretroshare.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-08-12 13:42:30 +00:00
drbob
964f6ccac0 Restored user names to file shares
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-31 10:29:50 +00:00
drbob
69c14461cb Merged v0.5-netupgrade branch back into the trunk ( --- Merging r4410 through r4465 into '.' )
This brings lots of improvements:
 * UDP Connection Code - this it the majority of the new code.
 * Simplification of p3ConnectMgr => p3LinkMgr, p3PeerMgr & p3NetMgr.
 * Notifications of Failed Connection Attempts
 * Addition of a "Getting Started Guide".
 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-18 09:25:15 +00:00
csoler
fc05314af0 corrected a bug due to reading uint64_t with wrong format on some systems, which caused the hash cache to sometime fail
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4437 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-12 20:07:28 +00:00
drbob
f6f721a492 Removed p3ConnectMgr. Replaced it with p3LinkMgr, p3NetMgr and p3PeerMgr.
Updated references in other classes.
 * Most classes need p3LinkMgr, and only use two functions: OwnId() and getOnlineList()




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4416 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-09 18:39:34 +00:00
chrisparker126
58ecbcb331 fixed bug for 'copy error' and losing cache data
conflict in unix and windows style directory names 
led to cleaning of remote and local directories in 
Cachestrapper::loadlist()


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4403 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-06 23:46:32 +00:00
thunder2
de87a89437 Added a name to the RsMutex class.
You can enable the debugging of the waiting time for a lock of RsMutex in rsthreads.h with
#define RSMUTEX_DEBUG 300
That means all locks waiting longer than 300ms are logged into the stderr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-04 22:59:39 +00:00
csoler
e77913914d fixed bug in search with size in MB. Caused crash due to deserialization error.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4347 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-06-28 08:18:54 +00:00
drbob
66b9f42835 Added Check for the existance of each Cache File before that are passed on the loader.
This should once and for-all remove the copy file warnings - I hope ;)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4343 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-06-26 21:43:49 +00:00
drbob
a333b12618 Fixed the Missing Cache File bug.
* Added Old Cache Storage... so these can be retrieved.
 * Connected up the CancelCacheFile() -> FileCancel.

Other Changes.
 * Removed ipaddr = 1 bug (thought someone else had commited this earlier???)
 * added #ifdefs to remove debugging output in p3BitDht.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4330 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-06-24 15:10:52 +00:00
csoler
3925a7114a removed debug ifdef
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4272 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-06-15 20:12:17 +00:00
csoler
f290c8eca4 Made the hash-cache more compliant with mounted/network drives:
- corrected bug that would wipe out the cache file every other start
- missing root directories are not discarded anymore, but kept empty, unless the user really removes them


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-06-15 20:03:26 +00:00
thunder2
72d9f352e3 Removed the difference of the separator for Linux and Windows.
Removed extra "/" of the filename (e.g. "E://") of the hashed file when sharing a whole drive.
Recompile of the gui needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4200 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-05-15 12:42:55 +00:00
csoler
c0f94a41db used tr1::unordered_set instead of std::set to store pointer checking list, as it is more efficients for lookups
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4158 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-04-15 20:21:52 +00:00
thunder2
bc113326e4 Fixed problem with utf characters in the %APPDATA% path on Windows.
Added function for opening files on Windows and Linux - RsDirUtil::rs_fopen.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4124 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-04-03 23:11:38 +00:00
csoler
b9af3bab92 made FileEntry derive from SmallObject class, to improve memory cache efficiency (50% time gained)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4122 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-04-03 20:10:26 +00:00
csoler
6c2bdbe214 - added some optimization to RequestDirDetails internal functions
- improved sorting/selection in shared files flat mode
*W* Needs full recompilation.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-04-03 19:59:12 +00:00
csoler
26311a7ad6 turned some uint32_t into int, for file watch period (did not produce a bug, but was still incorrect)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-03-31 19:59:56 +00:00
csoler
7c6682b89f added a checkbox in settings for tuning auto-check of shared directories
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4107 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-03-28 21:52:21 +00:00
csoler
794ab4aa06 implemented a backward compatible fix for bug when searching (advanced) with max size larger than 2Gb
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-03-15 23:12:46 +00:00