csoler
3add068cdd
removed status member from FileDetails. Not used => misleading
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6944 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-13 19:41:52 +00:00
csoler
5800069acf
error handling in pgphandler.cc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6938 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-10 10:08:41 +00:00
csoler
3e88b54ae3
removed asserts and put proper error handling in compress.c
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6937 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-10 09:49:13 +00:00
chrisparker126
972674173d
added tests for gxs update items
...
- need to fix to allow saving sync config
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6936 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-09 22:24:49 +00:00
csoler
162ef94b70
extended max chunk TTL to 1 hour. A short TTL is not anymore needed since chuns are shared between sources
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6935 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-09 13:35:06 +00:00
csoler
b2bea751aa
restriction to only accept self-signed certificates for friend keys
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6928 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-07 14:29:46 +00:00
csoler
68138fc1c8
fixed import of retroshare identities that have multiple signatures from the same key ID. Fixed bug reported by claude37
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6927 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-07 13:46:00 +00:00
csoler
214375ede1
added test program for identity import
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-07 13:10:57 +00:00
csoler
79e25b5dce
added post-hash check for file modification. If the file has been modified while being hashed, it will not be shared until re-hashed. Should prevent chunks error in files that get hashed while being copied.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-05 20:11:32 +00:00
thunder2
e269128bdc
Fixed compile on Windows.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6923 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-05 17:44:46 +00:00
csoler
028c9f8c07
split lastRecvTimeStamp into two different time stamps: one for last time the file is wrote (or data is received) and one for last activity that is used (and sometimes reset) by ftcontroller when queuing files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6921 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-04 20:26:54 +00:00
csoler
dd22bd24d9
fixed display of correct IP for connected friends. Only the external IP was shown previously. Port is not shown because it is random and could be misleading. Needs full recompilation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-30 13:48:39 +00:00
csoler
6fe16d55e1
fixed up some debug text (patch from H.Morgan)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6917 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-29 22:09:13 +00:00
csoler
a1ab524bdf
reduced string for lol bomb filtering, to filter out <\?xml* instead of <\?xml\ *
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6916 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-28 21:11:53 +00:00
csoler
f7a36d65a9
filter out disallowed direct sources from file request source list. Should systematically prevent unwanted direct transfers
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-28 20:53:03 +00:00
csoler
01588f6f53
fixed bug introduced in 6910, due to calling member on deleted mCreator
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6914 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-28 19:43:14 +00:00
chrisparker126
e50f017572
Fixes of msg sync optimisation
...
- msg sync opt now working
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-27 21:54:05 +00:00
csoler
dda9d4eca5
do not accept keys without a uid. Previously this was crashing RS
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-27 20:37:24 +00:00
csoler
830404a25e
fixed the bug that caused unwanted direct downloads. A check was missing in ftController::FileRequest
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6911 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-27 20:12:16 +00:00
csoler
75c178082f
fixed last received time stamp so that it displays the last time data was actually received
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-27 20:01:09 +00:00
chrisparker126
3460457771
nxs grp sync optimisation now working
...
- msg still needs a bit of work
- bug fix in grp sync found (reputation logic wrong)
- bug in nxssyncmsg serialisation from recent work
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6909 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-25 22:28:17 +00:00
chrisparker126
db30ea3ad4
forgot serialiser bad init
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6908 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-24 12:38:21 +00:00
chrisparker126
1cdf329bb1
fix for trigger statement, and readjusted algo to use self gen-exchange generated time stamps
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6907 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-24 12:37:17 +00:00
chrisparker126
24839ee237
decided to use polling and a database trigger to maintain consistentency of last group post for database sync
...
- db reset done, you will lose your current gxs data
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6906 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-23 23:39:55 +00:00
chrisparker126
6cbb3a65f8
fixed linker issue, and bad initialisation of pointer bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6904 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-17 23:15:39 +00:00
chrisparker126
f74aacd759
remaining code for nxs sync optimisation
...
- still needs testing
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6903 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-16 13:40:04 +00:00
chrisparker126
2e886bf443
Add gxs update items for nxs sync optimisation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-10 22:27:50 +00:00
csoler
d2ddf9c4c4
computation/update of routing probabilities
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6899 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-08 22:22:40 +00:00
csoler
2e5069cc2a
removed debug output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6898 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-08 21:24:57 +00:00
csoler
9c4c5da73d
Changes according to experiments from jolavilette:
...
- set desiredRate of peers to 10MB/s instead of 1MB/s
- maximum number of active chunks per peer is now 20 (that was a serious limiting factor)
- ticks that bring no data are not accounted for in the speed estimate anymore. The data is averaged over all ticks since the previous
non zero data chunk -> this brings much more stability to sources and removes lots of oscillation.
The maximum theoretical speed per source peer is therefore 13MB/s (in "Average" DL mode), whereas previously it was 1.3MB/s
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6897 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-08 21:23:57 +00:00
csoler
3f09bdb0b7
removed false warning that come up when openning a non existing file in ftFileCreator.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6896 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-07 21:17:18 +00:00
csoler
c9cf757187
changed re-hashign strategy. Now uses in priority the system time of the index file as a reference for new files. This automatically accounts for changes in system time and fixes the re-hashing bug for daylight changing time. In case the reference time cannot be establishd, the comparison reverts to the old method. This change is backward compatible and should not cause a re-hash. Report to the devs if it does.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6895 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-07 20:03:05 +00:00
thunder2
a20109a8ee
Fixed version files (*.in)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6894 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-05 23:53:39 +00:00
drbob
6871f9875a
Fixed up bugs in Recogn System - basics work now.
...
- added missing decrement to DataCount in rsmemcache::erase()
- added missing note_event_locked() in rstickevent ... can now use previous tick info,
- revamped recogn scheduling. on demand rather than periodic. new function recogn_schedule().
- deferred loading of pgpIdList for pgphashes, until we know it will be needed.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6893 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-05 23:33:12 +00:00
drbob
7be86dc0e9
fixed up versioning stuffup.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-05 23:14:30 +00:00
csoler
03e6fb8a4a
added basic probability computation to global routing matrix, and debug output. Fixed bug in Float serialisation (this should be improved btw)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6890 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-05 21:15:26 +00:00
chrisparker126
cf8a63888b
some fixes
...
- id pull now works (Peer A, Peer B test)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6889 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-04 14:09:32 +00:00
chrisparker126
67c55991d7
decided to continue propagating peer details in
...
- gxsnet now has a ctor option to disable auto group sync
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-03 23:46:34 +00:00
csoler
e0863194a3
Squeleton code for the global routing matrix. Most functions are left unimplemented, but
...
the basic structure is here. Functions have been added to serialise both SHA1 and floats.
The router is not yet enabled since protocol is likely to change again.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-11-02 14:35:33 +00:00
drbob
812ddef40e
added missing mutex lock.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6885 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-31 23:39:05 +00:00
chrisparker126
f2884d580f
added author pull code
...
-- problem, still need to figure out how to get peer auth req should go to
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-29 21:29:20 +00:00
drbob
bd0b1a5ac5
Updated SVN revision number for v0.5.5b.
...
Moved #defines to code files for better encapsulation.
Removed other references to #defines.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-25 00:42:49 +00:00
thunder2
e6d67ebf5a
Code maintenance for Qt 5:
...
- Added some more includes needed by MinGW-w64 for GXS
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6874 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-23 09:23:32 +00:00
chrisparker126
a6f62caef4
-fixed an update issue with actual group item
...
- simply didn't open grp file in "out" mode on update
-made update a bit more sturdy is group not found on update
- prevent client can crash librs
- updated unit tests for grps and messages
- removed data base removal on db reset as cannot rekey db unfortunately (as passphrase (ssl) cannot be kept in the clear in mem)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6873 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-22 19:56:01 +00:00
thunder2
31fd6f6261
Code maintenance for Qt 5:
...
- Fixed compile with MinGW-w64 under Windows
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6866 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 21:42:15 +00:00
csoler
580860ca81
removed debug output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6864 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 18:09:40 +00:00
thunder2
5b6aa594c6
Code maintenance for Qt 5:
...
- Renamed CacheData to RsCacheData, MinGW-w64 has already a class with the same name
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 12:07:33 +00:00
thunder2
9095e9bd75
Code maintenance for Qt 5:
...
- Added some more includes needed by MinGW-w64
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6860 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 11:00:49 +00:00
csoler
6780ff2cff
fixed bug that would cause virtual peers list for outgoing files to never get cleanred up. Also improved cost of updating the status of virtual peers. Many thanks to Jolavillette for finding this out!
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6858 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-21 09:05:51 +00:00
csoler
4cf86c52a1
more accurate version of scope timer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6856 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-20 13:29:24 +00:00
drbob
fc58861447
Added RecognTags.
...
- items are described in serialiser.
- util functions in util/rsrecogn.cc are used to manipulate it.
- these are attached to GxsIds, with new interface fns.
- Associated Signing Code is in a separate program.
Other Tweaks.
- Added RsMemCache::erase()
- Added RsTlvStringSetRef
- Fix for rsturtleitem (already added to trunk).
- Formatting and debugging.
Status: There is a bug in RsGenExchange::updateGroup which prevents full testing,
The basic generation, parsing and validation functions have been tested and are ok.
The processing as part of p3IdService still needs to be fully debugged.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6854 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-20 09:43:30 +00:00
csoler
68922f45a2
added scope timer to measure times conveniently
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6850 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-19 20:54:42 +00:00
csoler
69862404d6
fixed to/from for encrypted messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6842 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-18 14:31:13 +00:00
csoler
b9a79db9b0
removed some debug output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6841 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-17 18:45:59 +00:00
csoler
cd43900eb9
added flag and icon for message that was successfuly decrypted
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-16 20:02:28 +00:00
csoler
7876001be3
remove three costly loops in ftController
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6833 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-15 20:39:13 +00:00
csoler
a8c250e7d9
fixed warning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-15 20:28:30 +00:00
chrisparker126
19d7faa572
finally found group signature bug, was aliasing signature in validateGrp call (perfect example of why one should use const)!
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-14 22:03:11 +00:00
chrisparker126
fc1b7fcb5c
more debugging of group update
...
- did not correctly perform sync
- admin signature validation was being skipped!
- still niggly issue with admin signature validation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6829 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-13 21:49:17 +00:00
csoler
48839249c0
changed version string to 0.5.5b
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6826 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-13 12:23:00 +00:00
chrisparker126
55bbfb29da
Electron patch
...
- fixes issue with, message offsets not being calculated in loop correctly, resulted in only invalid message offset in db after calling message removal
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-11 17:29:38 +00:00
thunder2
13e7ac8b43
Fixed compile of the libraries with MinGW 4.8 on Windows.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-07 23:11:10 +00:00
csoler
e4e28c733c
added the possibility to distant chat with unverified identities, while warning the user about it. Should help distant chatting.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-07 20:49:02 +00:00
chrisparker126
25d721b6fe
Code change to test group edit
...
- can modify group names and content now
Group edit code fixes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 21:07:31 +00:00
csoler
4b9378aadd
adding missing files
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 20:16:58 +00:00
csoler
120a27d9c7
- added RsCompress with memory compression methods based on ZLib (already linked)
...
- added test code for RsCompress methods
- used compression to compress file lists so as to reduce bandwidth usage
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 20:12:34 +00:00
csoler
67517ad074
restore file state when restart (Modified patch from Phenom)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-06 12:56:37 +00:00
chrisparker126
18944404cc
make update function pure virtual in interface
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6804 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-05 12:03:31 +00:00
chrisparker126
9470e5562a
Added update capability to forums ui
...
Added timestamp check for group update in nxs
decided to add control variable to allow meta changes in updates rather than none
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-05 11:36:31 +00:00
csoler
9d4033b043
fixed unused variable warning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6802 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-04 21:00:31 +00:00
csoler
695e417fd5
changed std::wstring for std::string+utf8 in chat, and messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 21:41:34 +00:00
thunder2
bf9270dd54
Removed the external library pthreads 2.8.0 on Windows build and used the library of MinGW (version 2.8.0 too). This fixes header mixup of both versions.
...
Switched to the release version of pthread so the name of the dll changes from pthreadGC2d.dll to pthreadGC2.dll. The new dll can be found in the bin directory of MinGW.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-03 16:23:02 +00:00
csoler
2466c01e35
enabled checksum code in rscertificate. Shoudl make the transfer of certs more safe
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6791 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-02 20:28:42 +00:00
csoler
f961dc9066
enabled display serialisation errors in p3service
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-02 20:09:42 +00:00
csoler
3a82fffd0e
- fixed bug (added missing call to addSerialType())
...
- removed unused RsFileTransferCacheRequestItem and all related functions
- fixed bug in turtle router calling members of a deleted item
- removed some debug info
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-02 19:56:01 +00:00
drbob
b587301b5a
Added a thread per active peer - to reduce RTT and increase throughout.
...
* Added pqithreadstreamer, tweaked pqistreamer to support derivation.
* Shifted RTT from p3Service to p3FastService.
* Disabled lots of debug.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-02 03:21:04 +00:00
csoler
27041aa1a6
fixed bug in turtle router, causing potential memory access error in rare occasions (sendItem does not delete items fast enough, normally).
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 22:23:08 +00:00
drbob
a7dd9ad9e3
Work-in-progress to reduce latency time:
...
* service->SendItem() now goes direct to pqistreamer buffer.
* split p3FastService out of p3Service.
p3FastService removes the recv buffer for faster processing.
p3Service maintains its original interface, so derivate classes can remain unchanged.
* Added uint32_t usec (wait period) to BinInterface.moretoread() & cansend() for future threading.
* Added Mutex protection to pqistreamer, pqissl and derivatives of both.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6783 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 10:11:34 +00:00
csoler
8e7fe9f79b
made file transfer a service. Removed all the old FT code from pqiHandler, and got rid of deprecated CRC32 computation/exchange methods
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-10-01 08:11:15 +00:00
csoler
4e4b4f0822
fixed missing return
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-30 21:15:01 +00:00
thunder2
571099d56b
Optimized p3HistoryMgr::cleanOldMessages.
...
There is no need to check the messages when mMaxStorageDurationSeconds is set to 0.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 13:31:15 +00:00
csoler
4e259fecfd
allow max storage duration to be 0, in which case we keep all history
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 12:10:59 +00:00
drbob
41daabe1ef
Added Round Trip Time service (revived old p3VoRS service).
...
- Fixed gxs priority level.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6776 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-29 07:11:02 +00:00
thunder2
4dd77457ad
Added info widget for encrypted messages in MessageWidget.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-28 22:05:38 +00:00
drbob
90aa57a0f0
Rewrite of the discovery system to be more private, with less traffic.
...
Split the visState into seperate vs_disc and vs_dht for easier handling.
Split the heartbeat system into a separate service.
Added IPv4 and IPv6 local/ext addresses into discovery & peer config.
Fixed up samenet and samesubnet ipv4 calls.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-28 08:09:59 +00:00
drbob
70c947ba90
fix for upnp use of sockaddr_storage
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-28 02:42:59 +00:00
csoler
e21d869006
- added history parameters for chat lobbies
...
- added max storage time for items in chat history. Avoids filling up the history with chat from volatile peers.
- worked out the layout in config->ChatPage in a more compact design and added help
- set the max size of chat messages to 6000 bytes instead of 2000 which was a bit too low
- default max number of lobby messages saved in each lobby is 20. Avoids flooding for peers who havn't configured it yet.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-27 21:18:44 +00:00
thunder2
72c7569619
Fixed compile of libretroshare on Windows.
...
Cleaned some includes of openssl.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-26 23:53:06 +00:00
csoler
f25f46dffb
fixed missing update of transferred bytes count, that caused tunnels to not show a correct speed estimate on server side
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-26 18:38:35 +00:00
thunder2
a98f1d90b0
Fixed compile of gxs.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-26 10:09:40 +00:00
csoler
027b9ba017
removed warning that happens when lobby has no activity
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-25 18:34:50 +00:00
thunder2
6a9dfed408
Added new action "Load images always for this message" to image blocking.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-24 20:19:21 +00:00
drbob
43832a1f58
fixed typo in windows code.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-24 16:20:29 +00:00
drbob
ae2df43b8a
re-wrote cleanupDirectory() function. As this a cause of the slow startup.
...
Startup time is massively improved!
Please test on Windows!
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-24 15:31:15 +00:00
drbob
34ea22d5f6
Implemented sockaddr_storage functions.
...
Fixed interfaces for UPnP.
Some further tweaks to get TCP connections working again:
- hiddenNode issue in p3peers.cc
- fixed socklen_t for bind() and connect() calls.
- initialise addr to IPv4 for netmgr.
- change netAssist (Upnp) interfaces.
Still todo: tou address functions, test UDP functionality.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-24 05:30:01 +00:00
csoler
cda8557b73
added entropy collection system based on mouse movement to location/identity creation, to make keys less predictable
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6753 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-23 20:55:34 +00:00
csoler
8ffc0e05de
added control for suspicious message activity in chat lobbies. Lobby items are not bounced if coming from a peer that sends more messages per seconds than a given limit. The limit is adaptive and depends on lobby count
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6751 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-19 22:10:24 +00:00
csoler
11435dfd61
added limit in number of chat lobby ids sent by a peer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6750 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-19 19:44:20 +00:00
csoler
37f00e90a0
added new filter to remove xml bombs. To be continued
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-18 19:32:04 +00:00
chrisparker126
2a841d7ab3
fixed mem bug
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-18 18:13:38 +00:00
csoler
235a189774
tuned 2000 chars limit to only chat lobby traffic
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-17 05:57:02 +00:00
csoler
6052f2042f
tuned 2000 chars limit to only chat lobby traffic
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-17 05:55:43 +00:00
csoler
4ee7d8bb7e
drastic removal of <! from all wide string in all RsItems, from the de-serialisation code. Shoudl prevent lol bombs throughout the whole software. To be tested further
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-16 22:24:43 +00:00
csoler
cb4e28f5db
modified patch from AC to remove big messages from chat lobbies (likely to be a flooding attack). Displayed the name/location of the friend who relayed the message
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-16 22:00:26 +00:00
chrisparker126
3799910188
More changes to support front end of group update
...
- still need to make sync changes
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6741 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-15 21:18:20 +00:00
csoler
81a4523434
- Enabled multi-tunneling by consistently perturbating partial tunnel id in TRs.
...
This causes tunnels with a different route to have different ids and therefore
coexist as different sources for a given transfer.
This should cause file transfers to have more tunnels and therefore a better balance
of bandwidth over intermediate peers. This needs to be evaluated on a large scale network.
- Cleaned some unused code.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-15 19:05:04 +00:00
csoler
d127d36131
added missing setPeerState that caused tunnels to get stuck to default minimum rate unless the list of connected peers change
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6739 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-15 18:27:52 +00:00
csoler
4b44304aec
Enabled PFS for SSH connections, based on a 4096 bits safe prime. This is retro-compatible, meaning that old peers will connect to the new one using PFS if they act as a client (meaning they request the connection)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-14 12:28:45 +00:00
drbob
6290d8fed9
Massive commit - changing from sockaddr_in => sockaddr_storage.
...
In preparation for making RS support IPv6.
NB: This breaks the build of retroshare-gui, as the
sockaddr_storage_xxx fns are only defined as prototypes for now.
All the aux libraries like udp / stun / tcponudp / dht have still to be converted.
These changes will probably break various things and need to be tested thoroughly.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6735 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-13 14:35:19 +00:00
chrisparker126
33eb99d812
added group update feature
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-11 20:42:56 +00:00
drbob
fd071161bf
Added IPv6 encoding.
...
Switched IPv4 encoding to be always in Network Order.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6732 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-11 07:09:30 +00:00
drbob
14f99418ae
Added PgpIdSet
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-11 07:06:47 +00:00
drbob
5322040d29
disabled outgoing normal connections - if hidden node.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6730 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-11 07:00:33 +00:00
thunder2
961f079882
Fixed version number (*.in)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6727 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-10 21:10:11 +00:00
csoler
9d8d773c3c
fixed proper display of crypto params for UDP connections
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6725 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-10 19:31:44 +00:00
drbob
98eff88d5b
corrected version number.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6722 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-09 04:59:22 +00:00
drbob
bfd915864b
mods to support hidden node: setup & cert sharing.
...
Also removed old configuration mode from p3cfgmgr
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6720 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-09 02:10:49 +00:00
csoler
c7bfcbe8ad
fixed const in serializer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6716 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-08 12:02:15 +00:00
csoler
3a69ae2be8
removed debug info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6715 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-08 11:42:13 +00:00
csoler
ead05b9d9e
fixed stupid mmistake causing large distant mesassages not to be split correctly
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6714 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-08 11:16:13 +00:00
csoler
8aa3ccad72
removed code inconsistency (did not cause any issue)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6711 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 14:12:11 +00:00
csoler
cd7e2df37e
switched Sha1CheckSum::toStdString() to simpler/faster code. checked with tests/util/sha1_test
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6707 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 13:48:55 +00:00
csoler
eeb2dcaaf2
drop corrupted config files instead of looping into them
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6706 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 12:49:36 +00:00
defnax
dffba4225c
update version string
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6704 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 12:16:41 +00:00
csoler
2cca7a3b02
updated version number to 0.5.5 prior to release
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6703 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 08:21:13 +00:00
drbob
561cfcf189
Switching on GXS by default.
...
switching rs data directory to ./retroshare6 for the moment.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6701 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-07 02:55:35 +00:00
csoler
eee6e0400c
added auto-creation of extensions directory when not present
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6700 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-06 22:04:47 +00:00
csoler
3d0d047d14
removed one unused member of PGPCertificateInfo
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6699 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-06 20:07:10 +00:00
csoler
887c9ed50e
fixed potential uninitialized memory read in PeerUploadInfo
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6697 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-06 19:06:56 +00:00
csoler
89f48fc1b6
fixed bug in pgp handler causing trust info to not being saved correctly
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6696 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 21:28:39 +00:00
csoler
ff0495c684
fixed uninitialized memory read when sendign a message to a lobby that was previously unsubscribed
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6695 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 20:55:59 +00:00
csoler
65e7ad0e5b
pqihash now uses Sha1CheckSum
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6692 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 19:28:10 +00:00
csoler
b76161dd5f
removed uninitialized memory read
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-05 18:45:40 +00:00
drbob
a6cf738371
Removing old services, serialisers and other references for:
...
- forums
- channels
- tunnel
- blog
- gamelauncher.
- distrib.
Note this majorly breaks the GUI, for the moment.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6683 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-03 14:51:23 +00:00
drbob
212b4c44c9
First of the V0.6 changes.
...
- Adding basics for proxy connection.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6682 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-03 13:35:39 +00:00
thunder2
5dee253030
Copy name of the location from the cert to RsPeerDetails in p3Peers::loadDetailsFromStringCert.
...
The name of the location was missing in ConnectFriendWizard, only the id was shown.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6665 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-09-01 12:11:21 +00:00
csoler
4c87eb0781
distant outgoing messages stay in outbox until actually sent
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6661 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 21:10:04 +00:00
csoler
19808587e9
fixed display of toaster for distant msgs
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6659 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 13:12:26 +00:00
csoler
8d94ecf9ff
added proper own signature flag to signed sent message
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6658 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 12:54:47 +00:00
csoler
c3732f5212
fixed display of distination peers in Sent messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6657 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 12:49:04 +00:00
drbob
60087f0ef9
Added return value checking of mutex_lock() function.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6656 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-31 08:16:09 +00:00
csoler
51f0726dd3
remove (distracting) message about unknown lobby message that appears when not subscribed to a previousl subscribed lobby
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6655 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 21:09:48 +00:00
csoler
731e832734
added proper memory for sources of distant messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6654 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 21:06:23 +00:00
csoler
abd8c1e32f
improved name support for distant peers in messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-30 20:40:28 +00:00
csoler
6e8679ff90
automatically put paused files at end of queue (Patch from Phenom)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6642 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 21:26:27 +00:00
chrisparker126
0ecbd0d22b
fix for gxs channels not getting synchronised (reputation was getting requested for empty author ids)
...
fix for external circle associated groups not synchronising message (circles being checked for peer who want to share out messages for circle associated group)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6635 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 19:27:04 +00:00
drbob
f184d75703
Added Hack to fix OSX Finder launch.
...
Changed argstream.h licence from GPL to LGPL with authors permission.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6631 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-28 02:11:52 +00:00
csoler
34b8bbb236
fixed bug allowing a peer to alter the flags of lobby items so that they can get displayed in the broadcast channel. Now the checkMessageSecurity() method also checks flags consistency (et toc!)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6621 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 18:36:46 +00:00
csoler
a98642dab5
avoid corrupting file cache on 64bits architectures that store time_t as 32 bits
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6619 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 17:44:38 +00:00
drbob
5dffde209a
Tweaked rscertificate to return empty sslid, if only_pgp is set.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6615 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-26 06:56:20 +00:00