Commit Graph

2346 Commits

Author SHA1 Message Date
drbob
a4aa011207 GxsChannels are basically complete now!:
- Fixed up Automatic downloads for GxsChannels. 
 - Tweaked GXS backend to make Meta Changes happen before requests.
 - Added some new Macros.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6231 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-16 12:31:31 +00:00
drbob
5dac882572 updating svn version for release.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6229 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-16 12:13:09 +00:00
drbob
1f6d6a4fc2 Added backend support for Comments.
- Single Vote per comment checks and balances added. 
 - Fixed up RsGxsImage stuff. (TODO move to proper REF counted Image).
 - Added GxsTokenQueue ticks were required.
 - Made GenExchange publicToken() fns  public, so that comments can use them.
 - Added OwnVote details to Comments 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6224 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-15 20:46:49 +00:00
defnax
de9ec4776e update version
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6223 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-15 11:36:20 +00:00
csoler
79cef5704e updated revision string to 0.5.4e
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6222 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-14 20:14:51 +00:00
drbob
b9f2708927 Improvements to Comment Handling and GxsChannels.
- Added Vote dummy data into channels.
 - Fixed up RsGxsImage handling to avoid memory issues - need to switch to shared_ptr later.
 - Added "BestScore" calculations into Comments - not sure if the maths is right.
 - Added Hashing interface to Channels.
 - misc bugfixes.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6218 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-13 00:24:57 +00:00
csoler
4c670e81f0 removed debug output from ftcontroller
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6216 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-12 17:44:00 +00:00
csoler
7fcdedea27 further reduced TR forward probability so as to avoid a crazy increase of TR out when we have a large number of friends
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6213 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-11 21:32:32 +00:00
csoler
6cb37ac478 fixed debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6209 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-11 20:46:18 +00:00
csoler
400f9f63d8 added/fixed some debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6208 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-11 20:44:23 +00:00
drbob
123d4a630b Major commit of progress on new GxsServices (Channels and Posted). These are not complete yet!
- Reorganisation of p3posted, stripped out lots of previous stuff.
 - Converted p3posted to use GxsComment system.
 - Disabled much of the DummyData - switch it on manually when testing.
 - Added Basics of ChannelPost processing for AutoDownload. (incomplete).
 - Added GxsCommon backend for RsGxsImage and RsGxsFile.
 - Completed Serialiser for GxsChannels.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6207 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-11 20:40:28 +00:00
csoler
4b9087b60d removed dead-end for peers not answering downloads, that would get file cache transfers to get stuck indefinitly when peers are too much stressed for a short period. The offline state is entirely given by setPeerState()
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6206 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-11 20:33:49 +00:00
chrisparker126
12172e3acc Added PGP GxsId signature creation
group creation operates on a 10 second timeout rather than number of attempts

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-11 16:04:25 +00:00
csoler
7c0fb5eced fixed other uninitialized memory read
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6204 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-10 22:48:47 +00:00
csoler
4e4e81fa8e fixed uninitialized memory read in debug statement
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6203 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-10 22:29:25 +00:00
csoler
22befbfdf4 fxed uninitialized memory read in p3NetMgr
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6202 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-10 22:21:07 +00:00
chrisparker126
bc8c569db3 Added group validation code.
Tested and seems to work fine
Reverted back setAuthenPolicy static function to overwrite semantics and modified wiki and channels policy to equivalents statements

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6201 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-10 15:08:04 +00:00
chrisparker126
83ec723d8d Added group signature creation
Added return values for deferred sign function in identity and circles
Not ready for deferred sign testing yet

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6199 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-08 19:55:59 +00:00
chrisparker126
23209c8c45 handled validation/sign of message when key not available
(set for 5 attempts before message is dropped)
moved rstokenservice.h to retroshare interface folder
groups do not sync anymore unless user is subscribed to it

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6194 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-06 23:33:23 +00:00
drbob
d39460bec0 Fixed service_type => 16bits in gxscomments.
Removed OLD RelatedMessage() data checks - which we killing comment tree.
Added debug indicating comment / vote counts.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6191 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-04 22:47:32 +00:00
drbob
0f78719d7f added missing checks for deserialisation success.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6190 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-04 22:43:55 +00:00
drbob
c2150768db Fixed up a couple of serialiser bugs.
- service_type is 16bit.
 - missing return statement.
 - added a bit more debugging too.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6189 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-04 22:42:32 +00:00
drbob
22782e5edd Adding Basics of GxsChannel Service into libretroshare.
This includes a generic CommentService, which will be used by other Services.
+ Bugfix, gxs service threads were started before global variables were set.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6186 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-04 20:26:48 +00:00
csoler
4c3905e257 simplified the chunk drawing code a little bit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6177 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-01 23:41:42 +00:00
csoler
1fb605cfa9 fixed stupid bug causing streaming mode to get stalled
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6176 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-01 23:16:09 +00:00
csoler
9b01e3658d implemented deferred signature method in notify system to alow signing from a non GUI thread
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6175 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-01 23:00:43 +00:00
csoler
4d6ca28e53 fixed bug (Plz drbob & chris, check this one)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6173 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-01 19:03:55 +00:00
csoler
1efaa6d5ab added 2 missing return statements
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6172 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-03-01 19:01:11 +00:00
chrisparker126
50c75de73c Refactored GXS interface to remove exposure to RS internals (i.e. only reference types, declaration in retroshare folder)
To achieve this I created second interface RsGxsIface which RsGxsGenExchange derives from, and RsGxsIfaceImpl (renamed RsGxsIfaceHelper) now takes an instance of this instead so these interfaces don't exposed the RsGenExchange and its underlying types. 

The other stuff is simply definitions and type aliases required for the front-ends to work (RsGroupMeta, RsGroupId, etc) and I've moved gxs flags also. 

This is a good idea as it seem much more clear what's available to a GXS service (apart from RsGenExchange public methods).  


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-28 21:58:38 +00:00
csoler
4f1dda2ffb added new DL mode: Progressive. This is a random mode that ensures no more than 50MB of free space will be written in the file at once. This should effectively remove the lag when initiating a DL on a big file, while keeping enough entropy to ensure a good dissemination of chunks
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-28 20:42:01 +00:00
drbob
ea8d71ee71 Fixed AuthenFlags ...
There were a couple of issues.
    - Setting function was wiping other flags. This is fine - if known - but not how we were using the fns.
    - Offsets were just wacky!

Added some more debugging so we can know if/why a message is not being created.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6162 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-27 22:51:58 +00:00
drbob
c13192b4c3 Fixed up validate / create Signature logic.
Added comments about missing re-try for Keys that are not in Cache.





git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6159 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-27 21:20:00 +00:00
drbob
ebce79f9fa More disabled debugging.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6158 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-27 21:18:36 +00:00
drbob
65e3f02bb0 Added #defines to disable much debugging statements.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6157 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-27 21:16:03 +00:00
csoler
5b4739352e added dynamic menu for choosing download directory for files being transfered, and change the name of the destination file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6156 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-27 16:59:16 +00:00
csoler
5646e29357 added auto-check of shared files after each download. If that causes too much activity, we will make this a option that in on by default
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6154 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-27 10:03:54 +00:00
drbob
61c3afe56d moved GXS Macros (e.g. IS_GROUP_SUBSCRIBED) to gxsflags so they can be used by all gxs services.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6149 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-26 23:34:42 +00:00
csoler
c117078566 removed debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6139 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-23 12:53:20 +00:00
chrisparker126
d6c34f1b74 Fixed sign validation. request not reachable in previous logic
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-16 10:51:00 +00:00
chrisparker126
21dd979ba8 Fixed for duplicate messages ending up in db, set msgId and grpId as primary keys in message and group table respectively in db when created
Please delete your TESTNET folders so a keyed db is created
few additional fixes
- did create id list for meta request in dataservice
- possible fix for uninitialised values for rsdb



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6123 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-12 21:45:30 +00:00
thunder2
7413bdc50c Fixed crash in RsDataService::retrieveNxsGrps
- accessing a deleted iterator.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-10 23:28:06 +00:00
chrisparker126
73ff746773 Passed RsGixs to forums to enabled authentication
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6119 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-10 18:41:15 +00:00
drbob
6cd9faf3ab added AuthenPolicy code for p3wiki.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6118 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-10 17:52:50 +00:00
chrisparker126
bf5981e8b4 Added authentication policy and policy function for gxs forums
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6117 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-10 17:41:30 +00:00
drbob
39a7942337 switched off gxs again
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-10 17:35:57 +00:00
drbob
a77fa5a8d1 revert back to saving public key always.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6115 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-10 16:50:30 +00:00
drbob
81307de7c9 Added flag to disable dbase reset, and disable dummy data creation.
This also switches to alternative test data path - to ensure it will be empty.

Fixed bug in p3idservice related to dummy id creation.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6114 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-10 15:40:07 +00:00
chrisparker126
7867063734 Fixed resource exhaustion due to message/group notification not being handled
Added message/group size limit
Added message validation (identity and publish key)
Added code for message/grp fragmentation/defragmentation (not integrated yet) 
Added crude id picker to photoshare


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6106 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-02-07 23:04:16 +00:00
thunder2
97d0348f23 Added patch from AsamK:
- Fixed compile on 64 bit by removing an unnecessary cast to va_list

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6086 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-23 13:19:05 +00:00
csoler
62a22fe0fe added patch from bNK to make glib include dir detected on all linux systems. Removed warnings about gpgme and gpg-error, which have no reason to stay now.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-22 20:43:48 +00:00
thunder2
ef49000b9a FeedReader:
- Added error handling to xml functions
- Added xslt transformation
- Added retransform of existing messages
- Redesigned preview dialog
- Enabled embed images for forum feeds
- Changed config format, switching back to an older version results in a loss of all data of the FeedReader

Added new base class RSPlainTextEdit with placeholder text.
New library libxslt needed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6081 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-22 00:11:43 +00:00
csoler
e7536960c3 - fixed inconsistency in parameter naming, causing error_string to be mixed up with gpg id (Not a bug).
- removed unimplemented entry loadCertificateFromFile()


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-19 13:43:35 +00:00
thunder2
a60422069c Added api for news feeds to the plugin interface.
Added news feeds to the FeedReader plugin.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-01-08 22:07:52 +00:00
csoler
24a40fc665 - make addFriend a virtual (pure) function of the abstract p3LinkMgr class. Useful for testing.
- updated test notes.
- patched netsetup_test and upnpforward to run correctly.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6051 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-27 21:18:16 +00:00
csoler
b2214fcd46 removed #ifdef USE_NEW_CHUNK_CHECKING_CODE, since it is enabled by default now. Also removed the use of assume_availablility to put chunks or not in checking mode. This was inconsistent. As a side effect, cache files of size > 1MB get chunk-checked as well, which is good
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6050 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-27 21:16:33 +00:00
csoler
c11c602568 fixed auto-test results
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6049 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-27 18:09:07 +00:00
csoler
3ff9ff9a14 added missign file
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6048 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-27 18:05:17 +00:00
csoler
05df11117c fixed auto-tests in pgp directory
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-27 18:02:15 +00:00
csoler
d1752bbdcb fixed util tests
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-27 15:58:55 +00:00
csoler
10e2ed536e finished fixing tests in ft/. Removed my scripts.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-27 11:49:41 +00:00
csoler
3b678beca9 fixed more tests. Added checking for initialized partials and download directories in RsDiscSpace
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6043 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-27 10:23:38 +00:00
csoler
8720ab968e fixed compilation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 23:15:18 +00:00
csoler
447193a576 fixed crosscreator test
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6041 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 22:44:22 +00:00
csoler
9cf6db3051 fixed ftserver3test. Apparently cache items are not transferring ok
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6040 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 21:25:08 +00:00
csoler
cf947e7b7c fixed ftserver2test
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6039 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 21:09:53 +00:00
csoler
871ca11aff fixed ftserver1test
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6038 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 20:55:44 +00:00
csoler
4756711f10 fixed ftcontrollertest. runs correctly now
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6037 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 20:17:44 +00:00
csoler
4e586c84ba - added TestUtils class to handle generating random files and random SSL/PGP ids.
- fixed ftcontollertest. This should help fixing ftserver[123]test as well
- improved pqiTestor using templates (lots of identical functions replaced)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 19:53:27 +00:00
csoler
66207b81e5 - made the names consistent between ftdata, ftdatamultiplex and tests/
- added missing virtual functions in ftDataRecv
- setup initSSL instance as a static member of AuthSSL, instead of an external (does not change much except the init in rsinit.cc)
- changed p3PeerMgrIMPL to take SSL and PGP ids as parameters. This avoids calling AuthSSL and AuthGPG from the constructor => very helpful for tests.
- added random creation function in t_RsGenericId<>
- added functions setAuthSSL_debug() and setAuthGPG_debug() to manually setup the authSSL and authGPG objects to use. Used in tests.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6035 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 18:12:19 +00:00
csoler
69859f2a43 working on ft tests. Not finished yet
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 14:02:56 +00:00
csoler
2865ba30ce fixed sh scripts. Needs "#!" to indiate what shell to use
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-26 09:28:38 +00:00
thunder2
e569c89476 Added missing include for Linux compile.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6031 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-22 23:40:28 +00:00
csoler
d893d30883 - made errors of certificate (new formaT) parsing translatable.
- added checksum code for new format certificate. Will be enabled in v0.6, since it is not backward compatible
- fixed very stupid bug in radix64 cleaning function, causing any certificate to be accepted as a radix string
- added list of non backward compatible changes in README.txt, so that we can track them


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-22 21:22:03 +00:00
thunder2
0f26b85a88 FeedReader:
- Remove "sid=" from link
Moved stringToUpperCase and stringToLowerCase from rsinit.cc to util/rsstring.cc


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6029 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-22 21:01:45 +00:00
thunder2
13ac670eec Changed config type of the FeedReader. There was a conflict with general config.
Added warning in p3ConfigMgr::addConfiguration when a config type is used twice.
Removed checkbox for "Experimental Features" in general page without function.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6027 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-22 00:02:40 +00:00
csoler
986c2cf3e6 added some automatic test scripts. Needs to be done in all directories. Only serializer/ and util/ done now.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-19 23:05:38 +00:00
csoler
06f1f18e17 fixed some compilation bugs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6011 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-17 23:19:05 +00:00
csoler
cfa2640ff8 forgot to patch this Makefile
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6010 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-17 23:08:53 +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
766d156315 Added SystemExternalAccess Function to RPC.
This provides ExternalPort + DHTKey to Client. To be used to find and connect - even if Dynamic IP address changes :)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6004 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-17 19:15:04 +00:00
drbob
97e9458f36 Added little upnp utility / test.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-17 17:58:45 +00:00
drbob
d3787cb324 Make rs-nogui+SSH compile against the trunk.
* converted to new flags format for File Operations.
 * converted from PUBLIC to VISIBLE lobbies. NB: This required name changes to protobuf definitions.
 * converted DataRates to new function.
 * directory sharing shifted to using OTHERS flags (text menus) - No support for group Flags yet.
 * Added == operator to Flags Type.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6000 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-17 01:24:16 +00:00
thunder2
f764a82408 Fixed compile of gxs on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 22:39:58 +00:00
drbob
d8e327afcc * Patched for Arch.
* Disabled FeedReader until is compiles properly.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5997 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 21:12:26 +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
drbob
9b776ce6a4 fixed library (sqlite) config in .pro
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5992 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 15:30:21 +00:00
drbob
7b8bb8dff7 Cleaned up GXS compilation. now single config option (gxs) in .pro file.
Removed GXS headers from p3face.h and used class declarations.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5991 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 15:04:52 +00:00
chrisparker126
17bdfa7cad enabled token expiration, 30 seconds
add new, and hot ranking, and fixed top ranking for posts (not comments yet)
top ranking decay period set at 4 seconds for testing
enabled ranking posts 
fixed comments generation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5989 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 00:43:15 +00:00
drbob
95cbb57abf * Created dummy Circles (This takes a while - as we have to wait for dummyIds to be made).
* Provide CircleList, and Circle Details via rs interface.
 * Added debugging to help check its all working.
 * disabled caching of localIds - as this just causes cache to be flushed in p3IdService



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5987 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-15 23:07:12 +00:00
csoler
68c3e19a19 fixed compilation for SheevaPlug (Anonymous patch #61)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-15 22:43:31 +00:00
csoler
08d6bad6f0 added missing include for debian squeeze
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5985 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-15 21:03:34 +00:00
csoler
a14f893acc updated version numbers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5982 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-15 13:31:28 +00:00
thunder2
ef7a2aaa59 Added missing closeConnection when the connection dies with SSL_ERROR_SYSCALL.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5980 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-13 22:54:17 +00:00
chrisparker126
eed8c28d7b git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5976 b45a01b8-16f6-495d-af2f-9b41ad6348cc 2012-12-12 22:41:21 +00:00
chrisparker126
3eaf844ec8 Reworked ranking process flow
added ranking retrieval in gui 
removed locks from TokenQueue
refactored gxs p3 pointers in p3face header file 
and gxs services now shutdown correctly using join(led to bad segfaults on shutdown)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5972 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-11 22:26:11 +00:00
csoler
edd47f814d removed some debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-11 22:22:00 +00:00
csoler
60af8cefe0 corrected stupid mistake in previous commit
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5970 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-11 22:16:40 +00:00
csoler
71ed00cd68 made warning about missign fingerprint beingprinted only once
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5969 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-11 21:55:47 +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
drbob
5be03af4cd * Switch wiki dummy pages to use RsTickEvent.
* Add extra dummy page showing Markdown formatting.
 * Reduced number of dummy Ids generated.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5961 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-10 19:21:53 +00:00
chrisparker126
30b48c59ef Comment and Vote update now functional
Voting and comment count update in gui added via msg notification
clarified comments in RsTokenService

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5958 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-09 22:38:49 +00:00
drbob
3be22536df adding pegmarkdown support library.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-09 12:12:57 +00:00
thunder2
4413536926 Forums:
- Switched from own token member to the new methods on TokenQueue.
- Reactivated thread from the old forum to fill the messages.
- Load all messages at once.
- Added processing of missing messages.
- Fixed new/read/unread status.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5952 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-09 02:32:47 +00:00
chrisparker126
6527aaf2d8 Recommiting from old repo:
commit msg from last:

Fixed minor bug in group creation
msg now set to unread and unprocessed on creation (added read flag in gxsflags.h also)
Got topic and post generation working 

Additional changes:

Voting update now working

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5951 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-08 21:50:13 +00:00
chrisparker126
de757cfcae Added user type interogation of tokenQueue
fix for posteditem serialisation
added voting to gui, but no feedback yet
post and topic generation code added for testing 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5945 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-05 22:45:44 +00:00
csoler
d01745e54f Made the private lobbies more accessible:
- record which friend participates in a lobby even after they unsubscribed. The lobby list that is sent to these 
  friends contains the privaye lobby as well. In practice, people jsut need to be invited once to a private lobby. 
  Afterwards, they get the lobby in the list of nearby lobbies and can join by clicking on it.

- added new item RsChatLobbyList_deprecated2, to replace old existing item. Should be removed in v0.6
- changed PublicLobbies for VisibleLobbies in the code, to avoid confusion

- the change is backward compatible, although old peers won't receive private lobby info from new peers, of course.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-04 21:36:05 +00:00
csoler
8f7f00c6b9 removed compilation warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5941 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-04 21:28:35 +00:00
csoler
898011e514 changed fopen into RsDirUtil::rs_fopen, to allow paths with utf8 chars on windows. Shoudl probably fix many startup issues
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-02 21:12:31 +00:00
chrisparker126
bcf9f443b4 added option to RsTokReqOptions for group subscription filter
added code for rank calculation best,top, and newest (not enabled, not working yet...)
added variables for circles to grp meta type and modified storage and serialisation accordingly




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-02 19:40:17 +00:00
drbob
bcd67a8651 Added random AuthorId to Dummy Wiki pages.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5928 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-02 19:01:51 +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
drbob
4438303d55 * Got GxsCircles running in libretroshare.
- Completed serialiser.
    - added dummy interface fns. & cleaned-up other linking issues.
    - Added into rsinit.cc

 * Improved GxsIdentity DummyData to fake Ids from friends
    - #define to enable, must be switched off for real usage.
    - cleaned up rsIdentity interface.
    - removed genDummyData from public interface.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-01 00:16:24 +00:00
chrisparker126
44d32626bc Added logic for rank calculation and interface methods
Disabled posting when no post is selected
Added notes section when viewing post (tres basic)
fix for comment item serialisation 
fix for subscription token option not in this commit ;)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-30 18:54:25 +00:00
drbob
5a55c1b5d6 * Added the basics of GxsCircles service to libretroshare.
- Defined the control group stuff.
  	- Background task to determine friend membership.
	- Caching of Circle info,
	- Added GXS interface class to gxs/rsgixs.h
 	- TODO: Serialiser is incomplete.
	- TODO: SubCircles to be done in Phase 2.

 * Improvements to RsMemCache:
	- Added Value& ref(Key) to avoid data copying.
	- Added Statistics to check cache performance.
	- Fixed up bugs in tracking membership.

 * Improvements to RsTickEvent:
	- Added additional string parameter for more specificity.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-29 22:48:28 +00:00
drbob
78bc0a4567 * Cleaned up lots of old VEG services.
- left the code for p3gxsserviceVEG and p3postedVEG, until p3posted is finished.
 * Converted p3wireVEG => p3wire
 * cleaned up rsinit.cc and libretroshare.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-26 22:53:44 +00:00
drbob
90415627a2 * Added second (temporary) switch to turtle.
* Use session switch for OperatingMode.
 * made OperatingMode temporary - not saved.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5895 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-25 22:49:00 +00:00
chrisparker126
8cef4da896 Added posted comment creation
contextMnurequested does not seem to be working....may have to use an old fashioned non-derived treewidget.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-25 21:50:45 +00:00
thunder2
80dfa620b2 Fixed compile on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5893 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-25 21:48:00 +00:00
drbob
a134f81f95 Protected waitingIds with Mutex.
NB: This is windows code - which I cannot compile. Sorry for any bugs.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-25 20:52:10 +00:00
drbob
de80f2aa3e * Moved DataRate interface from rsiface (old) -> rsConfig.
* Internally moved storage of data rate from pqipersongroup -> p3serverconfig
 * made DataRate + Operating Mode work together.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5889 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-25 20:25:34 +00:00
drbob
0fa8d55062 Reviewed Mutex in pqihandler.
- In general it is okay, except for: DataRate Handling, and Win32 specific: WaitingList.
 - Cleaned up some functions.
 - renamed createPerson and createListener to locked_createPerson and locked_createListener.
       This is required as neither Listener nor Person are thread safe (TODO).




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-25 16:36:55 +00:00
drbob
696e7735a1 Added new libretroshare interface for switching between Operating Mode.
This is so people can use RS in limited bandwidth or background modes.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-25 14:59:42 +00:00
csoler
fd723bcea7 added global switch to enable/disable anonymous routing. This will be used for connexion profiles with very limited bandwidth
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-25 14:26:32 +00:00
chrisparker126
744a78b140 Added cleanup code for GXS services in rsinit (services now based in GXS_phase1 folder in .retroshare/ folder
disabled msg synchronisation by default through compilation #define (use GXS_ENABLE_MSG_SYNC to enable message sync)
Finally removed v2 suffix from all photo components and filenames (please edit your libretroshare.pro file accordingly)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5883 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-24 19:49:23 +00:00
thunder2
09f42dbc3c Added new level gpg id to FriendSelectionWidget (groups, gpg id, ssl id).
Added friend selection to the group dialog for better assigning of friends to groups.
Updated english translation.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-24 14:48:31 +00:00
chrisparker126
ebbe967402 Fixed posted item serialisation (wrong way round)
cleaned up comments gui and added loading framework
correctly initialisaed posted items


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5876 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-22 22:40:31 +00:00
defnax
c154c6b408 update version and Changelog for 0.5.4c
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-21 08:25:41 +00:00
csoler
63ceac29d2 suppressed bug due to not cleaning source lists. Would cause transfers to have inconsistent direct sources
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-20 21:42:21 +00:00
csoler
44992631cc updated version number to 0.5.4c
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5856 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-20 12:09:45 +00:00
csoler
b2e97407b5 added dynamic addign of direct sources from file lists. Useful for channels. Is called once every 61 seconds.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5850 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-19 22:45:37 +00:00
drbob
c6e6d444bf Added Identity Info retrieval to rsIdentities.
This is now pretty much complete for Phase 1 of GXS.
Still todo:
	- PGPHash signatures.
	- Reputations.

 - Added two helper classes GxsTokenQueue: similar to TokenQueue, but for libretroshare
       & RsTickEvent: schedule one shot events, and basic stats.
 - Reorganised/simplified p3IdService using these two classes.
 - Added fns to load/reload a list of Own Identities.
 - Improved the Cache to store all GUI required Info.
 - Updater retroshare/rsidentity.h with new Identity interface.
 - added fns to update Cache from internal background tasks.
 - Modified RsMemCache to support replace operation.
 - Found nasty Bug that caused PGPHASHes not to match & Patched same bug in GXS.
 - added generic CacheArbitration.
 - Added AuthorIds to dummy Forum messages.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5848 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-19 22:00:05 +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
chrisparker126
92f1673729 A stab at progressing posted, got post creation working and parameterised GxsGroupDialog for creating "create <service>" header for all gxs services
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-17 21:43:21 +00:00
chrisparker126
ae5cbecaba Fixed relatedMsgData bug (PARENT | LATEST), same issue as ALL_VERSION opt flags, was using origMsgId used for filtering (filtering worked as bugged request was actually requesting all msgs instead).
Added test for (PARENT | LATEST)
All tests passed

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5835 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-17 18:45:14 +00:00
chrisparker126
d591d795bd Fix providing mask for setting group subscribeFlag, msgStatus and grpStatus
Tests updated

Also setting msg and grp Status to unprocessed and unread on receipt from a sync (see rsgxsflag.h). These are set on bits masked by 0xf00.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5834 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-17 14:35:21 +00:00
csoler
414ae0d97f fixed simulator to work with new file permission code
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5833 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-16 21:15:39 +00:00
csoler
0aa921b010 fixed variable collision
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-16 21:02:20 +00:00
drbob
9373d26be0 * Added Dummy Forums and Messages to GxsForums.
* Extra GxsForums::getRelatedMessages() fn + HACKs to cover up GXS bugs.
 * more debugging in rsgenexchange.
 * fixed up some of wikis text.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5828 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-15 23:50:54 +00:00
chrisparker126
2230bd1a96 Added getMsgRelatedData test
Fixed bug with getmsgRelatedFucntion for msgs with no relatives (message with no relatives would end of pulling itself, i.e. the id/data/meta of message whose relative are
being searched for)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-15 23:09:56 +00:00
csoler
8a3973de81 fixed command to grab upnp patched version
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-15 14:18:52 +00:00
drbob
b5910e0314 * Updated wiki service to support new MsgRelated data.
* Added Wiki Dummy pages to explain it briefly.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-14 21:27:37 +00:00
csoler
7fa9dbb2b1 patch from AC to solve compilation w.r.t. patched libupnp whatever the version number. Should work on debian as well.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-14 20:24:07 +00:00
chrisparker126
f74a328d61 Bug fix for ES_GXS_MSG_COMMENTS option
Fix for run thread loop of RsGenExchange (was using logic rather than isRunning, which led to some crashes on rs close

Added request and get MsgRelated function for ids, meta and data 
added template function to ease getting meta data from back end;

Updated Nxs tests, tests passed (failed initially because of change option requirements)
Added test for msgrelated Ids, still need to add test for all msgRelated functions (bug with mask, not filtering correctly)

Made changes for forum and wiki gui to use new API but gui needs to call correct get functions now (Bob).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5817 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-13 22:36:06 +00:00
csoler
d3a3efd492 added additional checking of incoming compressed chunk map, in case the data is currupted, which might happens with a corrupted ft_transfer.cfg file.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-13 20:13:09 +00:00
thunder2
9581e83c01 Fixed compile under Kubuntu 12.10.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-13 11:58:56 +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
chrisparker126
d8dc2a0420 publish key not generated for public groups anymore, added signature creation for publish and id keys (used in main line of code, correctly initialise ur gxs services)
groupid assigned to group before service_CreateGroup now (to help with identity using pgp hashes)
fixed up dummy group creation for photo service and ui 
completed basic functions of GxsGroupDialog




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-11 23:45:22 +00:00
csoler
f61a50c5a6 fixed permission of drap+dropped files. all attached files get added to extra list, but with different permission flags depending on the client. From that, we compute sharing permissions : turtle, or direct transfer only
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-11 21:17:00 +00:00
csoler
9000cf9034 patch from thunder to handle connexion break correctly, and therefore avoid false notification attempt of friend.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-11 19:28:45 +00:00
drbob
6906f47fa7 Bits and pieces to get forums compiled.
- Added some MACROS - could be moved to GXS headers?
 - fixed some GXS compile warnings.
 - added MsgReadStatus to forums interface



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-11 15:56:34 +00:00
csoler
bdc275e15f suppressed unitialized memory read
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-11 12:57:05 +00:00
csoler
ab26059570 added missing mutex in destructor of ftFileProvider. Probably responsible for some random crashes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-11 10:29:03 +00:00
chrisparker126
c9831b7bea Added message validation, not enabled at the moment
as msg sync seems to have stopped working. will fix (qos priority change?).
Added validated field to msg meta
Removed serviceString from msg transport.
Added grp flag setting to album create to test msg validation


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-10 23:42:38 +00:00
drbob
eeb96c5e62 Lots of progress with Gxs Services:
- Added gxsForum interface, service + serialiser to libretroshare.
 - Bugfix in rsgenservices getSize() at the wrong point, Added lots of debug too.
 - Dummy Collections to Wiki, can now create and retrieve Groups from the GUI.
 - Bugfix in rsinit (wrong backend for wiki) + added forum to startup.
 - improved debugging in GxsId serialiser.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-09 00:56:07 +00:00
csoler
786177eaf0 Files being downloaded anonymously are declared as available with flag DIR_FLAGS_NETWORK_WIDE_OTHERS. Fixes bug that prevented swarming to happen
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-08 19:47:39 +00:00
csoler
5e913feee7 fixed bug of transfers not handled by turtle router. This was due to a change is values of flags. I added a test to update flags from loaded transfer infos to convert them properly. Just restart your RS and your transfers will perform normally.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-08 19:18:45 +00:00
drbob
0327b47ccc * Enabled pgphash background work.
* Fixed lots of little bugs: ServiceString decoding, not saving to variables, etc.
 * Added createIdentity fns. - Can create Anon, but not PGPLinked ones yet? no idea why.
 * Added lots more debugging.
 * Added mutex protection for class variables.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-07 21:38:43 +00:00
csoler
6edb9eb4f8 Merged branch that provide group-based file permissions.
Now users can sort peers into groups in the friend list, and attribute flags and parent groups to the
directories in the share manager.

Flags are B-B-N, meaning in order:
- browsable for peers in the parent groups
- browsable for everyone
- network wide for everyone
Backward compatibility makes previously BN flags been interpreted as -BN, meaning browsable/network wide for everyone.

Be careful with this new feature. It has been tested, but it's a bit early to rely on it for highly sensitive data.

The merge also includes a significant improvement of the naming of flags with incompatible types
which should sort out some existing bugs as well, since inconsistencies in flag usage have been
found during the process.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-07 20:03:16 +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
drbob
c09cab4439 * Added back idKnown, and pgpHash to rsIdentity Group type. (needed in GUI)
* added in scheduling_tick() for coordinating background and pgphash ticks.
 * disabled Signatures until thread-safe version is present.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-06 19:18:11 +00:00
drbob
17e42f1ceb Added core code for pgphash calculations.
- Reworked GxsIdGroup members... moved IdType -> groupFlags, so Hash & Sign are only ones.
 - Reworked GroupServiceString storage.
 - Added core processing functions - yet to test!



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-05 22:28:08 +00:00
csoler
65146b77d9 fixed bug in permission check
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5776 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-04 15:15:36 +00:00
csoler
9a6b675657 fixed bug in gpg_id vs. ssl_id (grrrr)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-04 15:01:43 +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
chrisparker126
49096d29d2 - Added service_createGroup function which gives access to group keys and grpItem just before GXS group creation
- Temp fix for GXS services hang on dummy data generation. Given each GXS service own thread and chunked grp creation (separate thread may need to be permanent, no obvious around move grp gen cost away from critical path of tick, but unscientifically increases each services thread tick period to reduce cpu cost)

- change grpId assignment from hash of grp data to admin keyid

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-04 01:38:48 +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
drbob
e42cc1123c Switched to RsMemCache for Key caching.
- supports both private and public caching now.
 - bug fix in RsMemCache



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 14:07:26 +00:00
drbob
ffa8299718 * Fixed iterator bug in rsmemcache.h
* Added rsmemcache.h to libretroshare.pro
 * initialised variables in p3idservice (was killing caching).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 13:15:21 +00:00
drbob
a074c40e6f adding basic caching functionality.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 12:41:11 +00:00
drbob
df1755316b * Fixed up Key Caching.
* Added testing for Key Extraction.
 * Added Interface Fns for PrivateKey extraction.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 11:57:27 +00:00
chrisparker126
e0d332f564 added priority to nxs items (low, same as cache transfer items)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5763 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-03 00:02:50 +00:00
chrisparker126
6f6f55c166 Refactored signature creation to Gxs security
Fixed signing of msgs 
Added signing of groups (follows p3distrib grp creation method)
Refactored GxsGroupDialog in 2 new UIs, GxsCreateGroupDialog and GxsViewGroup for ease of logic, retaining flexibility across GXS services. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-02 23:35:10 +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
drbob
bd6b17a301 Improvements to Identity service.
* Added Id & Wiki serialisers to constructors.
 * Enabled cache_tick()... thought it doesn't process anything yet.
 * Added debug to Id Key cache system.
 * Fixed requests to match expected params.
 * Added cachetest basics - this is not finished.
 * Enabled generation of Lots of Dummy Ids - This demonstrates some queuing issues.
 * Added #define to easily enable GxsId as only new service - for testing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-02 00:45:50 +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
afa3248429 Moved loadCertificate from main, StartDialog and GenCertDialog to Rshare.
Switched StartDialog from QMainWindow to QDialog.
Updated english translation file.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-01 01:07:36 +00:00
drbob
2fadb6d44d disabled debug msg
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5749 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-31 23:27:13 +00:00
drbob
92969c2f58 Improvements to GXS services.
* Added serialiser for wiki items (actual data to be finalised).
 * Added wiki and fixed id services to be run properly.
 * Disabled dummyData for ids.
 * Fixed some bugs in Id serialiser.
 * Added missing fns in p3wiki



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-31 22:43:23 +00:00
drbob
216683f747 got the wrong upnp library for windows. fixed.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-30 00:15:57 +00:00
drbob
5ea912b00c Preliminary notes on Circles.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-29 23:25:09 +00:00
chrisparker126
da70036f0f fixed window minupnpc source, header file incorrect
got Topic creation working with Posted GUI/backend
refactored Posted/PostedGroupDialog to posted folder


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-29 22:41:41 +00:00
drbob
cddeaeea81 Got GxsId service compiling and linking.
- Added entries in rsinit.cc
	- Added serialiser functions.
	- Tweaked some datatypes.
	- Fixed up duplicate headers.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5736 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-28 23:13:15 +00:00
drbob
df1a3297e0 Fixed up circular #include issue.
Reenabled RsGxsIdExchange interface.
Compile p3idservice again.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5735 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-28 18:40:01 +00:00
drbob
a5f52e85a1 Added new Upnp interface fn, and dummy implementations.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-28 18:17:06 +00:00
drbob
d208b59d33 Split the upnp files into libupnp and miniupnp implementations.
modified libretroshare.pro to allow either to be used.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-28 16:51:00 +00:00
csoler
68f48a802c fixed some GUI bugs in network simulator
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5730 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-28 12:14:27 +00:00
thunder2
af2257b1a9 Added settings for the blinking icons
- private chat window/tab
- chat lobby tab
- all tray notifier

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5729 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-27 15:59:12 +00:00
chrisparker126
301e85c2fa Bug fix, did not add time stamp at msg signing stage (bug thunder found)
Did not do check for msgs that already existed, msg is not checked if it exist this is deleted and error is sent to GUI for token
need to do same for groups!
Removed stack allocated msgs which cause crashes for large message items (bug defnax found)
Added function to retrieve group keys from GXS to RsGenExchange
First bits need for validation: Signing now consist of all msg data (msg + meta except msgId and signature)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5718 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-23 21:52:51 +00:00
drbob
bb9a80e95b tried to link cache with data... turns out I can't extract the keys - help!
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5714 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-22 20:36:28 +00:00
thunder2
232af8e71e Changed SoundManger to allow the plugins to play sounds.
Added example to VOIP (commented out).

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5709 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 21:38:55 +00:00
chrisparker126
c518bd2f19 Removed references to postedVEG from GxsGroupDialog and associated classes and PostedDialog (GUI does not work now but does not crash)
Removed V2 references: TokenQueueV2 and RsTokReqOptionsV2 are now TokenQueue and RsTokReqOptions and renamed file
Added initialisation of Posted back end service successfully
Added new msg status flags  GXS_SERV::MSG_STATUS_UNPROCESSED and ::MSG_STATUS_UNREAD



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5707 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 19:45:35 +00:00
csoler
03d4936b12 improved display in share manager. Updated RemoteDirModel to show groups.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 19:39:56 +00:00
drbob
dcb64f6631 Added Identity caching to Identity Service.
- various p3IdService::cache_... fns.
 - moved duplicated print functions to GXS code.
 - restored compilation of VEG services.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 19:15:46 +00:00
drbob
85cd85fec6 disabled VEG services.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5704 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 17:21:15 +00:00
drbob
c5eee865a6 added definitions for RsGxsId serialiser items.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 16:18:21 +00:00
drbob
57a99d1aa3 Made p3identity compile. (but won't run yet!)
- Lots of tweaks to rsidentity & rsgixs interfaces to make them match.
 - added "mask" to gxs flag set operations.
 - added dummy RsMsgMetaData print functions.
 - enable compilation of code in .pro.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5702 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 15:48:18 +00:00
csoler
56e26ba00a First bit of group sharing permissions
- Added icons for share flags
- added new class to handle sharing permission widget
- Updated share manager
to be continued...



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5701 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-21 14:06:33 +00:00