Commit Graph

1934 Commits

Author SHA1 Message Date
chrisparker126
36103b29a1 added transaction items and more modification methods for data service (delete msg/grps)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5193 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-06-03 18:09:38 +00:00
thunder2
569d463f02 Optimized the fill of the up- and downloads in TransfersDialog.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5191 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-06-01 20:51:14 +00:00
defnax
bd67b1fe90 forget to commit this
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5189 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-25 07:49:42 +00:00
chrisparker126
768cf49da6 updated rsnxsitem test and added appropriate fixes.
fixed undeclared virtual methods in rsdataservice, added test files
overloaded assignment op for Rstlvbindata 
 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-24 22:38:59 +00:00
defnax
55b6211e7e update version string and changelog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5185 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-24 12:02:34 +00:00
thunder2
1855d19436 Added check for empty lobby nick name.
Moved notify of lobby nick name change from the gui to p3ChatService.
Added missing mutex locks for p3ChatService::_default_nick_name.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-23 22:33:45 +00:00
chrisparker126
add4715da0 implemented most of rsdataservice,
updated rsnxsitems with discrete msgs and grp item rather than collection of msgs/grps
added flags header file 
added first declaration of implemented genexchange service (client API interface)

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5180 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-21 22:07:43 +00:00
thunder2
443703e61f Switched back to not optimized compile on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5178 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-21 19:06:16 +00:00
chrisparker126
f05ed342ed added dataservice for adding and removing msgs and grps from. does not compile.
just a check point
Added client side defintions of msg and grp

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5175 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-17 22:45:48 +00:00
thunder2
14c1f9f599 Added dynamic locking function for the OpenSSL library.
This is needed when using OpenSSL from multiple threads.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5168 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-15 13:51:24 +00:00
csoler
ba56f5f611 fixed memory leaks
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5167 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-14 20:01:00 +00:00
csoler
c0e066598d switched chunk per peer and max chunk age to previous values, now that chunk cannot be slowed down by slower peers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-13 20:08:59 +00:00
csoler
ad5ca59a7a Fixed signature parsing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-13 19:04:13 +00:00
csoler
02a7548de4 removed possible data race on boolean value (Not critical)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5161 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-12 13:10:57 +00:00
notdefine
5a3863d216 Improved mute feature, to update Blocklist, when the peer changes his name.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5159 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-11 20:53:27 +00:00
chrisparker126
a957ec75b6 added more definition to gxs items
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5158 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-10 22:03:08 +00:00
csoler
f6c6af8b59 removed non-mutex-protected reference
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5157 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-10 19:04:31 +00:00
csoler
f5c345659a Improved multi-source file transfer in two ways:
- tunnels can borrow data chunks from only slower tunnels, to prevent blocking fast tunnels
- tunnels can handle up to 50 data chunks at once instead of 5
Multi-source transfers are generaly faster and more stable.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5156 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-09 21:31:05 +00:00
thunder2
ec501c6d6a Fixed issue with lost downloads when RetroShare exits (or crashes) during the load of the file transfer items. The pending list was not saved.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-07 14:54:46 +00:00
notdefine
d5bdae7bd9 Display old and new nickname to Peers during nickname change in ChatLobby.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5151 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-06 22:57:08 +00:00
notdefine
22bfcb62bc Preparation for mute Peers in the Chat Lobby.
RS_CHAT_LOBBY_EVENT_PEER_CHANGE_NICKNAME is send, when changing nickname, so the blocklist can be updated (in future).

This will never wort for 100% as discussed in the developer forum, but should stop the most spam.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5150 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-06 22:19:59 +00:00
chrisparker126
af71acd9ab debugged rsnxsitem and serialiser
added test serialiser test suite 
updated support.cc to handle variable service types and RsTlvBinaryData init_item


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5148 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-06 14:29:50 +00:00
thunder2
b81a911793 Friend recommendation message
- renamed subject
- added to system message
Recompile needed


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5145 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-05 22:20:05 +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
chrisparker126
db8d019b3f added serialisation code, removed two nxsitem types as they are redundant. still to add deserialisation and size functionality, then test
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5139 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-03 21:49:55 +00:00
thunder2
9df55782a3 Switched on optimized compile on Windows.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5136 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-03 14:33:34 +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
chrisparker126
79062f742e added base item declarations for nxs and gxs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5132 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-01 20:52:07 +00:00
csoler
fcb202f666 added keyring output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5131 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-01 18:45:24 +00:00
thunder2
c331098203 Added new message flag for system messages like friend request.
Show "RetroShare" as sender of system messages to myself.
Added new quick view in MessagesDialog to filter system messages.
Changed RetroShare link in friend request message to certificate.
Added new subject image for the system messages (defnax).
Removed not used notify in message service.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5129 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-01 09:18:55 +00:00
csoler
60fcd981c1 fixed binary signature
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5128 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-05-01 08:53:32 +00:00
csoler
ce5e6d3949 fixed password handling
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5127 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-29 11:57:03 +00:00
thunder2
d28ffb9c0d Added new notify on connect attempt by the local message system.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5124 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-26 23:41:14 +00:00
csoler
42687f32aa first working version !
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5123 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-26 21:39:45 +00:00
csoler
afc23f39c8 fixed signature verification
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5122 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-26 19:37:15 +00:00
thunder2
9501a4fe2c Added new friend request toaster from defnax.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5120 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-25 19:19:16 +00:00
thunder2
3678766a93 Changed parameter of RsChannels from "std::string" to "const std::string&".
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5117 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-24 12:49:54 +00:00
csoler
0587216350 fixed parsing of gpg info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5116 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-22 11:36:34 +00:00
thunder2
10400faf4c Removed minimal version.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5113 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-20 15:17:52 +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
4e26884646 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5111 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-19 20:44:32 +00:00
csoler
a9e496f845 Improved TR routing strategy:
- updated base forward probabilities to larger values
   - used a minimum FP to 1/nb_connected_friends instead of 0. This is the larger non-explosive value.
   - changed tunnel management time to 2 secs instead of 1, setting the overall number of TR/s emmitted 
     for all downloads to 0.5 (Should reduce the TR load for the whole network by a factor of 2).

With these settings, someone with N friends should receive at most N/2 TR/s at depth 1, which corresponds to 
N/2*50 B/s. To reach the limit of 1500 B/s, one needs to have 60 connected friends downloading. Accounting for 
friends at multiple hops, having more than 30-40 friends is likely to be unefficient, although it will not
stop the network completely as it did before.
	 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5110 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-19 20:23:58 +00:00
thunder2
b71eeadf95 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5109 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-18 21:20:37 +00:00
thunder2
9aee68a2a9 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5108 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-18 00:00:59 +00:00
thunder2
b2ea453804 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5107 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-17 21:00:54 +00:00
thunder2
d52904e7c6 Fixed critical bug introduced by one of my latest changes.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5106 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-17 11:38:52 +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
470951d664 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5104 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-15 14:37:44 +00:00
thunder2
83bd45caa4 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5103 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-14 22:38:24 +00:00
notdefine
60a68210d5 Activate DHTML in Doxygen Documentation, for Fold in/out Class hierarchy images.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5102 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-14 14:32:00 +00:00
notdefine
67aa7e3ac8 Small change
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5101 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-14 14:03:28 +00:00
notdefine
45e1bfee66 Updated Doxygen Configuration for
http://notdefine.de/retroshare/retroshare/trunk/libretroshare/src/html/index.html

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5099 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-14 13:59:33 +00:00
thunder2
0ac69b87db Fixed compile on Linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5098 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-14 00:36:20 +00:00
thunder2
545743ad77 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5097 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-14 00:30:23 +00:00
thunder2
3b85873313 Added patch from AC
- add missing includes "unistd.h" for compiling with gcc 4.7.0.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5096 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-12 23:29:39 +00:00
csoler
fa429ad8d4 added caching of GPG information to PGPHandler
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5086 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-09 17:03:47 +00:00
csoler
b43fb7e8b3 - added encryption / decryption of files and memory
- started implementation of new AuthGPG


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5084 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-08 14:52:01 +00:00
csoler
c27f695a37 updated to trunk of openpgp-sdk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-04 19:27:07 +00:00
chrisparker126
e560e00029 added more virtual methods to network exchange service
removed xml parser utility
removed extraneous info from retrodb

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5073 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-01 21:10:55 +00:00
csoler
eb448cbaaf fixed memory issue, added signature verification (uncomplete)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-01 21:10:54 +00:00
csoler
33a37054e8 fixed several memory leaks
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5071 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-01 16:43:23 +00:00
csoler
1888b21998 - added key copy methods to OpenPGP-SDK
- added encrypted key storage and retrieval to own keyring after generation
- improved test program



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5070 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-01 12:52:15 +00:00
thunder2
37986e00a3 Added three new toasters - private chat, group chat and chat lobby.
Fixed some utf8 issues in toasters and feeds.
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5065 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-30 23:02:52 +00:00
csoler
0778e8f691 3 patches from AsamK:
* fixed utf8 in dropping links to channels
	* fixed pasting cert links in the friend list
	* added code to allow pasting GPG certificates missing a newline at the end.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5064 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-30 19:43:39 +00:00
csoler
08a52dc369 fixed bug causing some transfers to never finish
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5063 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-30 19:33:58 +00:00
csoler
648555711c debugging of pgpkey parser and radix output form openpgpsdk
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5061 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-29 21:51:37 +00:00
thunder2
b32fddb3e0 Added two new functions to libretroshare for writing formatted data to std::string
int rs_sprintf(std::string &str, const char *fmt, ...);
  int rs_sprintf_append(std::string &str, const char *fmt, ...);


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5059 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-29 18:15:36 +00:00
csoler
51fa97ac59 bug fixing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5053 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-27 21:45:43 +00:00
csoler
765b6b9486 improvements to openpgp-sdk integration. Added/tested key generation, keyring output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5052 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-27 20:48:21 +00:00
csoler
4299d09741 patched openpgpsdkfor c++ compilation, added test program, started retroshare PGPHandler component
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-OpenPGP@5050 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-26 21:17:04 +00:00
csoler
8f69251334 small improvements to the chunk checking algorithm
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5047 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-24 14:45:33 +00:00
csoler
0e1b989e08 fixed version script (Patch form AC)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5046 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-24 12:40:23 +00:00
thunder2
9f627783aa Fixed deadlock when receiving a chat message with open history browser.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-20 21:25:39 +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
thunder2
e90b8c86d4 Added some missing locks in p3GroupDistrib.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5039 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-19 21:50:58 +00:00
csoler
633b66b1dd fixed missign delete in hash computation code
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5038 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-19 13:50:33 +00:00
chrisparker126
030b009f9a added RetroDb:
- tests added which pass on windows. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5036 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-18 14:06:36 +00:00
thunder2
0b1126babf Added thread safe function for inet_ntoa in libbitdht.
Used the existing thread safe function for inet_ntoa in libretroshare.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5033 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-18 01:33:25 +00:00
csoler
c9f99c0be9 removed debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5030 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-17 14:45:52 +00:00
csoler
456177ef11 fixed bug responsible for sending wrong checksums on windows systems
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5029 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-17 14:08:27 +00:00
csoler
40b9e17a2e fixed small issue in sorting information from different peers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5025 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-16 23:07:28 +00:00
csoler
65cde95fba - added/fixed patch from defnax to allow setting up a topic for each chat lobby. The topic is displayed to friends.
- handled backward compatibility by keeping/sending old LobbyList item. Should be remove in the near future.
- removed constraint to have at least one friends invited when creating a new lobby.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5024 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-16 22:47:49 +00:00
csoler
889a2b2433 Added deferred check of chunks during file transfer. Chunk sha1 sums are requested to the sources and checked for downloaded data.
Validated chunks are shared to other peers. Force check is now very simple since it just turns all chunks into "needs checking" mode
and sums are asked to sources. Sources maintain a temporary cache of chunks. Since sums are requested sparsely, this should not 
affect the sources in terms of performance. We can still imagine precomputing and saving sha1 of chunks while hashing them.

For backward compatibility reasons, the following has been setup *temporarily* in this version:
- unvalidated chunks are still considered as already obtained, and are shared and saved
- force check has been disabled
- final file check is maintained
- in case of file fail, the old checking mode will be used.

All changes for next version are kept in the define 'USE_NEW_CHUNK_CHECKING_CODE' that will be made the default in a few weeks.
At start, I expect most chunk to stya yellow during download, until most sources are able to provide chunk hashs.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5019 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-15 19:55:43 +00:00
thunder2
42bf3682ab Prepared libretroshare for compile with OpenSSL 1.0.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5017 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-13 20:35:58 +00:00
csoler
75f3a6a5d8 disabled adding new keys from friends of friends when discovery if off
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5016 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-12 21:38:41 +00:00
chrisparker126
e5ed6bf479 Penultimate touches to the RsGxsService interface
- added most request receive pairs for querying base service 
- Still need to finalise the RsGixs and Search functionality, look at p3DistribSecurity for this

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@5013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-11 00:05:43 +00:00
csoler
ea40749f6f fixed bug returning false while a string is expected
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5006 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-03-06 19:59:22 +00:00
thunder2
30564fe6ad Fixed utf8 characters in the transfer tab name of plugins.
Added Q_OBJECT to the VoipStatistics classes.
Removed compiler warnings.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5002 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-28 18:25:57 +00:00
csoler
0d8f65d480 fixed connexion of setInterfaces for all plugins
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5001 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-27 18:41:21 +00:00
chrisparker126
64de3d3643 updated retrodb classes and resolved some data access issues with
ContentValue class. 
Changed parameters to some RetroDb methods
updated RetroCursor with functionality to traverse result set correctly

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4999 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-26 23:30:26 +00:00
csoler
a4320d785f moved RS_SERVICE_TYPE_VOIP into plugin
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4992 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-26 15:36:07 +00:00
csoler
96fd780502 added ability for plugins to return their own PopupChatDialog class
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4988 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-25 12:17:36 +00:00
thunder2
45ac04e2e7 Count the friends (gpg id's) instead of the locations (ssl id's) in the statusbar.
Moved update of the friends from QTimer to signals.
Combined p3LinkMgr::getFriendCount and p3LinkMgr::getOnlineCount and moved to p3PeerMgr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4986 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-25 01:48:56 +00:00
chrisparker126
ccda22fe5e moved my(chris's) version of GXservice to rsgxs.h and reverted db_gxp_service.h back to original
slight modification of rsgdp to not handle encryption requests at its level

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4985 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-24 21:15:08 +00:00
csoler
826e8f3728 - added ability to plugins to add a tab in transfers dialog
- improved VOIP plugin to add RTT statistics tab to RS gui.
- added comments in rsplugins.h
- added big tooltip in transfers that would be stuck in checking... mode



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4979 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-21 21:53:25 +00:00
chrisparker126
e1d060f3b1 Added declaration of functions which would service GXS app requirements
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4975 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-20 21:08:45 +00:00
defnax
67c3321ae4 update changelog and corrected some path for win libs
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4974 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-20 12:38:04 +00:00
drbob
3208fcaffe updated versions to v0.5.3b and svn 4971
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4971 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-19 21:45:31 +00:00
drbob
f08c5bea2e Added BSD specific changes - data directory and #including <sys/params.h>
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4968 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-19 20:05:41 +00:00
drbob
d1df56e7f8 Added example details of how the functionality will be implemented.
Added a couple more cases.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4967 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-19 19:55:20 +00:00
drbob
12a94a8984 Adding First Pass Use Cases... for API Design.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-19 19:49:01 +00:00
csoler
08d57e1681 fixed returned value not accounting for tests
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4964 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-19 15:04:56 +00:00
csoler
ee5dcd1a8c - moved RsAutoUpdatePage into retroshare-gui/ directory, to allow plugins to use it
- removed VOIP code from main executable. Moved it into VOIP plugin (c.f next commit)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4963 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-19 15:03:07 +00:00
csoler
2c6a2b4ee7 improved plugin management to allow services to be used, and config pages to be added
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4960 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-18 20:29:03 +00:00
csoler
5679a30e67 Improvement to plugin system:
- made config page system more automatic, to allow addign config pages from plugins
- added (disabled) checkbox and function to allow all plugins for development
- added config page methods to RsPlugin class



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4957 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-18 14:55:50 +00:00
drbob
9544b61d77 * removed debugging from gpg cache.
* fixed position of #endif



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4954 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-17 20:28:59 +00:00
thunder2
970d88200d Removed some more compiler warnings from Windows compile (GCC 4.4).
Added -Wextra to the Windows compile.
Added new define in libbitdht for snprintf and fprintf to proper handling of "%ll" under Windows.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4951 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-17 10:03:38 +00:00
csoler
2d2b7230d1 added early sending of chunkmap request to newly added sources
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4950 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-16 22:58:30 +00:00
chrisparker126
565ef2b0f9 added more details to the gxp api
in particular what the features are:
- search 
- on-demand : for messages
- all data received via call back from gxs runner (RsThread)

Added functions are:

remoteSearch
createIdentity

and removed a few data request functions

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4949 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-16 22:15:21 +00:00
csoler
8b28fb2324 patch by AsamK to save finished/checking transfers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4948 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-16 22:04:03 +00:00
csoler
2edb61758b Improvements to file transfer:
- corrected 2 potential flaws of swarming causing request of unavailable data (This should normally be taken care of on the server side!)
- improved swarming test code with fault simulation
- only ask CRC32 maps to peers that have a complete file.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-16 21:10:46 +00:00
drbob
e024ea36e9 Added Cache system for GPG Certificates.
- This should reduce gpg calls by 90+%.
Updated rsversion svn to 4942 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4942 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-15 16:44:45 +00:00
thunder2
a2982f3370 Fixed private message notification. Remove offline private messages of none friends at startup and when a friend is removed.
Moved the removing of the history of removed friends from p3PeerMgrIMPL to p3ChatService.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4940 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-14 22:55:14 +00:00
drbob
2f6061c8ac added example of what the basic service should look like.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4939 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-14 15:33:58 +00:00
drbob
459b51e814 Addition of the Basics of the New Identity Service.
- Provides Real & Pseudonym Ids.
	- Real Ids are tied to GPG Ids using a One-Way Hash.
Added IDS for QCHESS and ARADO plugins.
Added new RsIdentity external interface.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4932 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-13 18:22:35 +00:00
csoler
c4be65e0ab removed cache adding strategy to DL queue that was O(n^2). Now addign cache at the end of the queue
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4930 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-12 20:00:22 +00:00
chrisparker126
0a254ab5a2 removed protocol naming convention
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4929 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-12 15:29:49 +00:00
chrisparker126
25fbf771a7 Removed most of the interface for RsGNP as it mostly makes calls to other components
Added final comments before review

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4928 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-12 15:18:05 +00:00
thunder2
07ea6829b6 The channel message (in channels) is set to read when the user clicks on the show more button.
The forum/channel news feed is removed when the user reads the message in forums/channels.
Recompile needed.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-12 00:58:47 +00:00
csoler
f441f4a407 set max chunk inactivity period to 5 mins instead of 1 mins. Shoudl favor slow DLs. This is nw possible since missing bits will be re-asked regularly
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4925 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-11 15:26:04 +00:00
drbob
57c7e66a38 Attempted fix for maintaining External Port in Manual Forwarded Mode.
- added check for RS_NET_MODE_EXT instead of RS_NET_MODE_TRY_EXT... as trys aren't used in p3PeerMgr.
 - removed tryMode from external interface - as this data is not available anymore.
 - Removed setting this parameter in p3peers.cc



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4919 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-11 12:18:56 +00:00
csoler
fd83e5950f added control over TR forward rate, so that we can experiment with it on large bandwidth servers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-10 22:23:06 +00:00
csoler
fa0def543d removed debug flag
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4908 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-08 20:18:41 +00:00
csoler
aa4eecf467 changed hash calculation of lobby connexion challenge to make it only usable by the receiver (thx bob to point me out this security issue!)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4895 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-06 21:00:09 +00:00
drbob
3ab62f147e Adding backends for new Plugin Services: Photo and Wiki.
- These are dummy services at the moment, 
	- they only hold stuff the current session and don't use the network at all.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4889 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-04 14:16:39 +00:00
defnax
014ad9b5c2 update version string
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4880 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-03 14:41:17 +00:00
drbob
8756b0d75d Switched BanList sharing to only your own list. (was OWN + FRIENDS lists)
- This data is not used at the moment, so just reducing data before release.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-03 00:59:41 +00:00
drbob
15ea61caa3 More changes for V0.5.3a
- Updated English Email Invite (sorry guys, you'll have to redo translations).
 - Set OSX default style to "Cleanlooks" - as AQUA style hides some windows.
 - Updated Version strings to V0.5.3a. / 4874
 - Fixed missing headers for plugin manager.
 - Disabled ZEROCONF for OSX.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-03 00:15:49 +00:00
csoler
7b3b5a76c3 added RsPQIService to allow plugins based on peer-to-peer services
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-01 20:27:25 +00:00
drbob
4e5e149a95 Patch from Peter - to build Retroshare on FreeBSD.
- Fixup BSD qmake parameters: mainly library locations.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-29 14:27:14 +00:00
csoler
6c7535a3aa suppressed debug output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-28 13:20:01 +00:00
csoler
c3be19227d Suppressed echoes in chat lobbies by:
- adding a time stamp to lobby events (new item tag)
- controllign time stamp of lobby msg and event: drop packets if time is older than cache duration.
- moved connexion challenge code to lobby management loop
- added new type of lobby invite to handle connexion challenges and avoid false invitations in the GUI

New lobby event format is not backward compatible -> "peer typing" and "peer joined/left" will need 
the new version. Messages are still compatible)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-27 23:13:28 +00:00
drbob
eb77648cd2 Added Minimal certificates to discovery exchange.
They are invoked if the standard cert is over 10k.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4853 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-27 13:46:31 +00:00
drbob
41bff1d839 Another fix for the discovery fiasco... Turns out that I broke the system with my previous changes.
- Allow certificates through with no attached GPG Certs.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4852 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-27 13:32:14 +00:00
drbob
00ff694e10 Fixed default data rates to sensible options: 200 kB/s down, 50 kB/s up.
Added StoreAllKeys() call after adding new GPG Certificate.
Added Check for successful Req creation (was crashing with NULL pointer).
Switched std::vector.data => &(std::vector[0]) to remove linuxism in radix64.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4851 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-27 13:03:59 +00:00
csoler
5a5c0264d0 fixed uninitialized values
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4848 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-26 20:03:54 +00:00
chrisparker126
efddc9afab more notes on gixs and things to clarify
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4847 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-26 16:51:01 +00:00
csoler
b002e08c06 changed storage delay of lobby cache, update time to last rejected (instead of accepted) message in cache and increased delay between connexion challenges
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4844 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-25 20:53:59 +00:00
csoler
fe156882ae added keep-alive packet to lobbies to maintain up-to-date list of listenners. Will need to play a bit with delays...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-23 22:49:47 +00:00
csoler
a8456a2332 Plugged-in method for removing signatures in PGP keys => now RS has small and constant-sized certificates.
- added checkbox in ConfCertDialog to allow adding/removing signatures
- enabled again key signature button in friend wizard
- RS cert links now use small keys.


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-23 20:55:08 +00:00
csoler
4422d6557b added method for removign signatures in a PGP certificate, and a test program to test it. Not yet plugged in into RS
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-22 19:55:10 +00:00
csoler
0a0ccd1f4f removed debug output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-20 20:47:05 +00:00
drbob
87944f251e * Enabled Relays by default.
- This will only effect people who upgrade from a very old version.
 	- Other people will have to switch it on manually.
	- Default is 0 friends, 1 FOF & 1 General @ 1kb/s... max 4kb/s usage per peer.
 * Switched off lots of debugging.
 * Bugfix for natassist (zeroconf returns 0.0.0.0:0 when its doesn't work).
 * Logged IP Addresses for Failed incoming connections.
 * Hacked IP address into the NewsFeed notifications (ugly).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4827 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-20 17:50:19 +00:00
drbob
6ac2cad4aa cleaned up some of the std::cerr output.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-20 15:13:50 +00:00
drbob
611db96fb9 Attempt 3 at fixing disconnections :)
* Added limit of 10kB for Certificate size. If it is bigger - discard certificate.
 * Remove certificates for slow / trickle connections (for Relay connections).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-20 14:41:45 +00:00
drbob
761bca8678 Fix number 2 for disconnections: Temporarily Disable Transmission of GPG Certificates in Discovery.
Certificate transmission will be disabled until we have worked out how to export Minimal Certs.
 * Disabled check for gpgcert text in p3disc.
 * Disabled creation of GPG Cert in AuthGPG.
 * Added extra error code to pqinetwork.

This change will mean that friends of friends certificates will no-longer be shared if you have discovery on.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-20 01:05:46 +00:00
chrisparker126
a89c6fd08a Removed cpp source files, don't need them yet.
Added more clarity to declarations 
Also added comment on general implementation of an
RsGeneralExchangeService


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-19 23:32:27 +00:00
csoler
a7af95c0fd removed debug info from chat lobbies in p3chatservice, and set the time limit for nicknames records to 30mins.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-19 22:05:38 +00:00
drbob
4aec00a0c2 Attempt at fixing the Disconnection issue.
* Added DataRate accounting to Relay and Dht.
 * Rates are exposed through rsDht.h interface.
 * Added LastIncomingTS() to pqistreamer.
 * Turned HeartBeat reset() into a warning.
 * Added NoPacket in 60 sec reset().
 * Minor typos/errors corrected.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-19 16:23:57 +00:00
chrisparker126
00c6010543 refined GDP, GNP, and GSP component further and made classes pure
virtual. 
- added interface to allow GDP and GNP to work via an observer pattern 
- added grpId explicitly to GDP, GNP and GSP
- shifting from protocol to service semantics


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-18 23:20:53 +00:00
drbob
8a86c980fc Improved logging of Connection Behaviours.
- Hid lots of DEBUG_BASIC behind #defines in pqissl.
	- Added PeerID() in many places, so grep for a single peer.
	- fixed linkMgr output so we can tell a FAILURE vs FAILED ATTEMPT
	- reduced most logging to a single line.
	- print out of errno in HumanText for SSL errors.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-18 22:51:38 +00:00
thunder2
3a271abf11 Added history for chat lobbies and disabled it until the lobbies are saved.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-18 20:47:32 +00:00
drbob
6d4fa40416 Added acadeeb - A bibiography / reference paper system.
Added wire - decentralised twitter clone.
Tweaks to other definitions.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-18 00:13:27 +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
thunder2
35c7605704 Extracted a new widget ChatWidget for the basic chat handling from the PopupChatDialog and use it in ChatLobbyDialog too.
Added an own ui for the ChatLobbyDialog.
Saved settings of the ChatLobbyDialog.
Changed parameters of RsStatus interface from "std::string" to "const std::string&"
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-17 20:36:36 +00:00
drbob
aa64617142 Early pass at defining new message exchange (cache replacement system)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-17 01:09:21 +00:00
chrisparker126
cf5158d2b0 added new declaration for retrodb and removed sqlite reference.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4804 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-16 21:52:22 +00:00
chrisparker126
2504c0fd9a added more interface declarations and comments clarifying
resposibility


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-15 13:07:31 +00:00
csoler
7d7101a62d improved counting method for public lobbies
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-15 13:00:57 +00:00
csoler
036bd64811 - Added chat lobby privacy type to lobby invite => lobby type is propagated correctly to friends
that are invited.
- added auto-clean of nicknames
- added auto-clean of public lobby records.

Warning: this commit breaks one small bit of compatibility:
 * direct invitations from new versions will pass accross versions (private lobbies will need the new version)
 * but people can still join public lobbies accross versions.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4801 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-14 21:09:04 +00:00
drbob
79998dd70c Added Native (Bonjour API) Nat Port Forwarding to OSX.
* new classe p3zcNatAssist
 * moved some common ZeroConf functions / definitions around.
 * moved virtual tick() to parent class: pqiNetAssist
 * added zcNetAssist section to makefiles. (active for OSX build)
 * setup switch between p3zcNatAssist & upnphandler in rsinit.cc

NOTE: Still to test network restart, etc, and correct exchange of external Ip Address.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4800 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-14 16:41:00 +00:00
csoler
2805d4ca1e disabled turtle routing for relayed connexions
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-14 13:27:48 +00:00
drbob
d138dde66c --- Merging r4780 through r4795 from /retroshare/branches/v0.5-dhtmods
Changes to support Relays.
* added p3BitDht::addKnownNode() so that DhtIds can be used instead of SslIds.
* switched from bdStdDht() functions to use bdModDht().
* made DhtFunctions a class variable.
* added function to modify NodePerBucket() parameter.
* Bugfix for LinkType. peerConnectAddress.flags was not initialised.
* Extra debugging of LinkType data (use LINKMGR_DEBUG_LINKTYPE).
* cleaned up udprelay output.
* Added Compile Rules to libretroshare.pro for building LocalNet Testing Version. (testnetwork)
* Added NumQueryNodes() function to bdDhtFunctions.
* Switched bdquery.cc to use bdNumQueryNodes().
* Extended bdStdDht class to bdModDht to allow NodesPerBucket to be modified.
* Fixed up Connection Fail Callback for Relay Servers.
* Added Extra debugging for Proxy Connections.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-14 09:28:16 +00:00
drbob
96c9071920 Changes to support Relays.
* added p3BitDht::addKnownNode() so that DhtIds can be used instead of SslIds.
 * switched from bdStdDht() functions to use bdModDht().
 * made DhtFunctions a class variable.
 * added function to modify NodePerBucket() parameter.
 * Bugfix for LinkType. peerConnectAddress.flags was not initialised.
 * Extra debugging of LinkType data (use LINKMGR_DEBUG_LINKTYPE).
 * cleaned up udprelay output.
 * Added Compile Rules to libretroshare.pro for building LocalNet Testing Version. (testnetwork)




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-14 01:54:17 +00:00
csoler
b3050b6b29 removed debug output
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4791 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 21:51:57 +00:00
csoler
17ea85e820 setup min lobby list request time to 20 sec.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 21:26:14 +00:00
csoler
ba109726ed fixed proper count of nicknames (not fixed yet in gui. A update is missing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4788 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 21:23:16 +00:00
csoler
7f93b1f5fc added missing returns
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 20:56:36 +00:00
csoler
9597571841 corrected bug preventing 1st time message to go to lobby for new subscribers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 20:56:03 +00:00
csoler
2aea0e5f30 corrected undefined variable causing public lobby list not to update properly
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 20:05:24 +00:00
thunder2
6c626e180f Chat lobby:
- added new notifier to p3ChatService
GUI:
- list all public and private chat lobbies
- added subscribe/unsubscribe
- added new basic widget ChatTabWidget and use it in PopupChatWindow and ChatLobbyDialog
- added a tabbed dialog for every subscribed chat lobby

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-12 00:13:25 +00:00
chrisparker126
3f0c811917 initial addition general exchange service interfaces
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-new_cache_system@4781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-11 23:01:29 +00:00
drbob
fc949ce5d0 --- Merging r4753 through r4779 from /svnroot/retroshare/branches/v0.5-dhtmods
Merging Dht Relay improvements into the trunk. These changes should finally make relays functional.
There are still some service changes required to reduce the traffic over relays.

Summary of Changes
---------------------

 * Changed the way proxy/relay peers are selected in bdConnection. (needs more work).
 * Added LinkType to peer info in p3LinkMgr & rspeers.h interface.
 * Added getConnectionType() to p3PeerMgr. This defaults to FRIEND for the moment.
 * Provide information about Bandwidth, Transport and Peer Type via LinkType().
 * Added RateCap() to limit traffic over Relay connections.
 * Set Internal Rate to 75% of Relay Limit to account for transport overhead.
 * Added various #include "util/rswin.h" to fix compile errors with standard ssl package.
 * Removed Local variables (mConnectProxyAddr, etc) which were hiding Class Variables.
 * Cleaned up bits in pqissl.cc and p3linkmgr.cc
 * Increased UDP Relay Packet size (max transport of 1400 bytes per UDP packet)
 * Modified checkRelay() to use Low Pass Filter to calculate Relay Bandwidth.
 * Improved udprelay debugging.
 * increased (x2) Relay Lifetimes - this is so that enough useful data can be transported (1meg).
 * Added LOCALNET_TESTING code to rsinit.cc. This allows Port Restrictions to simulate firewalls.
 * more debugging and minor bugfixes.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-11 11:54:28 +00:00
drbob
9e5e07d3f0 Reversed Changes for Testing Purposes.
* Disabled lots of debugging.
 * Disabled LOCAL test mode in udpstunner, rsinit
 * Enabled BadPeer checking in bitdht.
 * Restored normal timeout periods for connection attempts.
 * Restored normal connection levels for dht status.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-11 10:24:37 +00:00
drbob
e0dcca8d13 * Made NetworkStats() return false - as zeroconf cannot provide these (avoids the invalid 2.7G message)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4778 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-11 00:24:29 +00:00
drbob
ec05a7cc7d * Moved Relay Packet Debug to a seperate #define.
* Improved Relay Status Output & print when checkRelay() is called.
 * initialise timer variable (mMinuteTS) - was causing checkRelay to never be called.
 * switched to 10 second calling of checkRelay().
 * Increased RELAY lifetimes (x2). now GENERAL = 1 hr, so they can at least transfer 1 meg (minimum block size)
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-10 23:28:33 +00:00
csoler
1164c66d3a added new variable in config->transfers to allow reserving n slots to non cache transfers
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4775 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-10 23:07:53 +00:00
drbob
54c0524764 Added Low Pass Filter to Relay Bandwidth Check... To allow brief bits over the peak.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-10 19:50:16 +00:00
drbob
3d4feaaaf7 Set a RateCap that is 75% of absolute bandwidth limit. This reduced rate is required because
of the overhead associated with TCP and Relay connections:
 * The Internal rate is calculated based on transmitted data (a reliable stream).
 * The Relay rate is calculated at UDP packet level and is x1.1 - x1.2 higher than internal rate.
The Relay will drop the connection if peers exceed specified level - so best to leave some head room.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-10 19:40:35 +00:00
drbob
8267739b02 Final core changes required to get relay links working.
* Added LinkType to p3LinkMgr => exposed via rspeers.h
 * Added ConnectionType to p3PeerMgr. This is dummy default to FRIEND at the moment.
 * Flag bandwidth limited Relay links as such.
 * Switched DNS Address connect to in front of historical addresses.
 * Reverted Flags in p3LinkMgr to what they were.
 * Added LinkType Flags to rspeers.h
 * removed getConnectFlags() as it was a bad way to do things.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-08 22:15:19 +00:00
drbob
dc8e596c0f Added Rate Cap to RateInterface, and enabled it for Relay Connections.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-08 18:40:09 +00:00
drbob
abbebf48ff Partially completed changes to implement final relay bits.
* Adding more detailed flags to each connection.
 * Cleaned up unneeded stuff from p3LinkMgr.
 * Added rswin.h includes before openssl - allows compilation using std Win OpenSSL.
 * Added getConnectFlags() to Net Base.
 * removed net_attempt and associated obsolete variables from pqissl
 * Made NetBinInterface protected in pqiperson (is this okay?)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-08 16:28:44 +00:00
drbob
9da96aef97 * Increased the max size of the relay packet to match tcpstream packet sizes.
* Added More debugging.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-08 12:43:55 +00:00
drbob
88774bbbd3 BUGFIX: removed local variables which were hiding class variables.
+ more debugging.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-08 12:22:35 +00:00
drbob
2b7499e61d More changes for debugging
* Enabled lots of debugging.
 * Switched to shorter timeouts for udprelays.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4763 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-08 10:50:33 +00:00
csoler
1a191c7f91 commited currentgui state. Not working
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-07 21:37:31 +00:00
csoler
485c394e2b added interface methods for public lobby exchange and subscription to public lobbies. Need a GUI now
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-07 19:52:58 +00:00
csoler
434ba06c82 added exchange and auto-update of public chat lobby lists.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-07 13:33:30 +00:00
drbob
5936b6542a Hack to disable proxy connections - for testing.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-07 12:22:30 +00:00
drbob
af5f23e0e7 Changes to enable a LAN Relay Test Environment.
NB: Reverse Most of these changes - before adding to Trunk!!!!

 * Added missing BitDht callback functions for test/example code.
 * Switch tests/example to OSX compile.
 * DISABLE_BAD_PEER_FILTER (as it doesn't like local net)
 * Reduced Minimum Peer Counts for DHT to be considered active.
 * Added LOCALNET_TESTING to rsinit.cc 
	- new Commandline Option -R <lport-uport> to restrict UDP ports.
	- Enables LocalNet in UdpStunner.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-07 11:28:00 +00:00
csoler
e9d6940b09 Improvements to chat lobbies:
- added generic methods and items for bouncing generic objects through lobbies
	- added handling of peer typing status
	- proper handling of peer join/leave lobby
	- added sub item ids to lobby messages to allow proper message splitting
	- made 2 different message splitting methods for normal chat vs. lobbies. In v0.6, we'll have to handle all messages the same way.
	- added parent id to RsChatLobbyMsgItem, to allow threaded chat.
	- added possibility to make a lobby public/private (not yet fully working)
	- added items for requesting/exchanging list of public lobbies at friends' (not yet fully working)
	- major cleaning of p3chatservice.cc

Next move:
	- gui for listing friend public lobbies, joining them, etc.
	- load/save of persistent lobbies.
	- autoremove of inactive lobbies

Warning: lobby message items of this version are incompatible with previous versions. It won't crash, but
messages will not pass through.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-06 22:17:08 +00:00
thunder2
e430612714 Add the ip address of the DNSResolver to the top of the list of the connect addresses.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-06 22:03:46 +00:00
drbob
ac6f0fcfe4 --- Merging r4718 through r4752 from branches/v0.5-dhtmods
Added ZeroConf for OSX.
Changes for Relay Support.

Summary of Changes:
libbitdht
----------
 * added Relay Flags to bdNode::setNodeDhtMode()
 * added dropRelayServers() / pingRelayServers() functions for mode switches
 * added utility function:  bdFriendList::findPeersWithFlags()
 * added utility function:  bdSpace::clean_node_flags(uint32_t flags)
 * added RelayMode to ConnectManager.
 * added failedConnection callback when in Server Mode.
 * added incomplete udpproxylayer code. (not compiled)

libretroshare
-------------
 * added Configuration to p3BitDht for storing Relay Settings. (bit Hackish!)
 * added RelayHandler & getRelayReceiver() - to outsource some Relay functions.
 * + RelayHandler_InstallRelayConnection() & RelayHandler_LogFailedProxyAttempt()
 * added RelayServer, Mode and RelayAllowance to external DHT interface.
 * added p3PeerMgr::getGpgId() for ZeroConf usage.
 * updated parts of pqiassist virtual interfaces.
 * added Bandwidth storage to udprelay.
 * modified the way Relay Slots are allocated to match GUI interface.
 * ZeroConf now working on OSX.
 * added ZeroConf to OSX compilation.
 * extended rsDht interface to expose Relay configuration.

retroshare-gui
--------------
 * added Relay configuration panel.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-06 15:33:51 +00:00
drbob
73471b2618 Bugfixes for ZeroConf under OSX.
- Added Timeouts for Resolve and QueryIP, as these can continue indefinitely.
	- Added more debugging.
	- rotated port number using ntohs().
	- Filtered Self.
	- Allowed Other SSL IDs of Self to connect.
	- Fixed QueryIP to use hosttarget instead of servicename.
	- fixed Id order in mPeerMgr->addFriend().
	- fixed p3ZeroConf initialisation call.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-06 12:48:04 +00:00
drbob
c69da728d7 Completed implementation of p3zeroconf.
- Compiles under Windows, Links but doesn't talk to daemon properly.
 - To Test functionality under OSX.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4751 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-05 15:43:06 +00:00
drbob
58d8606d00 Added extra function to retrieve Peer's GPG IDs.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-dhtmods@4750 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-01-05 15:41:24 +00:00
csoler
94608c8467 added list of participants in lobby, handled large messages using splitted display (cannot ensure rebuilt message yet.)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-29 14:19:53 +00:00
csoler
fb263f2fcc fixed duplication of messages in ChatLobbyDialog
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-29 08:40:23 +00:00
csoler
b6f8e2a306 added leaving notification to chat lobby
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-12-28 22:33:37 +00:00