csoler
ddbe2ef9a1
created .cc files for serialization
2017-04-02 14:48:17 +02:00
csoler
b52071d0c9
removed RsSerializable and merged it into RsItem
2017-04-01 18:05:53 +02:00
Phenom
aa05d60894
Fix all warnings in UnitTest
2017-01-21 16:31:45 +01:00
csoler
0dd3a318ed
added last used TS in reputation items
2017-01-08 11:10:33 +01:00
Phenom
40cf76808c
Fix compilation and some new warnings.
2016-12-21 21:23:54 +01:00
csoler
948b88bccd
fixed bug caused by calling clear in constructor which would reset the TS in GXS when saving...
2016-12-19 21:40:04 +01:00
csoler
dd2a3c26de
fixed serialisation bug in new UpdateMap code, and removed debug info from RsGxsNetService
2016-12-12 22:52:55 +01:00
csoler
0d94b683dd
removed duplicate peerID/grpId in msg/grp update maps
2016-12-12 21:01:24 +01:00
csoler
a4c14c2212
improved serialisation methods in RsGxsNet items, and added serialisation for RsGrpConfigItem
2016-12-06 22:17:03 +01:00
csoler
661038d9b2
added a function to check keep/req times for consistency
2016-12-05 23:42:44 +01:00
csoler
5612647672
added new GrpServerConfigMap to store additional data on groups for net service. Removed pointers to simplify the code
2016-12-04 23:40:52 +01:00
csoler
143829c881
moved constants for GXS group management into rsgxs.h
2016-12-04 23:40:39 +01:00
csoler
f3a34bf5a3
created a new item to hold/save per gxs group information (statistics, update delays)
2016-12-04 23:39:45 +01:00
csoler
c6d21e4abc
changed old msg update default strategy to one month
2016-12-04 23:39:10 +01:00
Phenom
674b6de381
Fix Some gcc warnings 383 to 208 lines
...
Left explicit #warning and deprecated.
Some lines are wrong indented and produce mal formed code.
2016-11-30 22:01:01 +01:00
csoler
4bdfc6e74e
removed unused old file
2016-11-18 17:56:42 +01:00
Gio
633a6cf8c2
Fixed a bunch of warnings in safe ways
2016-10-13 00:01:33 +02:00
mr-alice
0757fb303c
merged upstream/master
2016-09-20 20:51:50 +02:00
mr-alice
679c53b0b0
added load/save of directory hierarchies. Fixed bug in loading of hash cache (caused y non initialisation of dest string in GetRawString())
2016-09-05 21:22:11 +02:00
mr-alice
ade6017f74
merged with upstream/master
2016-09-01 19:52:31 +02:00
Gio
746f4d7292
libretroshare remove unuseful code from RsRawItem
2016-08-25 15:11:58 +02:00
mr-alice
edc602f68f
added infrastructure for synchronisation of file lists
2016-08-20 16:23:11 +02:00
csoler
7545ad4d11
simplied/improved reputation system. Now ids can be banned based on their owner node using a single checkbox in the Person tab, with immediate effect
2016-08-04 11:43:35 +02:00
csoler
c4ef4d7743
saved owner node ID in GXS reputation item
2016-08-03 14:52:37 +02:00
mr-alice
5b9fd74d85
removed most of CacheStrapper stuff from ftServer, replaced fimonitor by p3FileDatabase
2016-07-30 21:52:42 +02:00
Phenom
3152ecaa9b
Fix UnitTests and run it in windows too.
2016-07-15 15:36:06 +02:00
csoler
0125f91b2d
fixed deserialise bug in FileItem
2016-07-06 22:36:59 -04:00
csoler
269f9457be
fixed load/save of new group ids and backward compatibility with FriendList
2016-07-06 22:02:56 -04:00
csoler
01c0d2f0f1
finished conversion to RsNodeGroupId for file transfer and GUI
2016-07-05 23:49:43 -04:00
csoler
4ee9effc4e
changed internal storage of groups of friend nodes so as to use an abstract ID instead of a string (phase 1 of local circles)
2016-07-04 23:55:48 -04:00
Phenom
d84fdff2e1
Fix GxsChannelPostItem when received comment.
2016-06-18 20:10:14 +02:00
csoler
25c0c9d4ce
added systematic consistency checking of public/private RSA keys at deserialisation time
2016-06-16 23:06:07 -04:00
csoler
dbd78d2401
merged with upstream/master
2016-06-16 20:19:03 -04:00
csoler
c3eba4a72d
added missing serialisation call for peer bandwidth limits
2016-06-14 21:54:24 -04:00
Cyril Soler
56e079739c
Merge pull request #413 from csoler/v0.6-Circles
...
V0.6 circles
2016-06-13 23:06:10 -04:00
csoler
fa29dd7332
changed the way RsGxsSyncMsgReqItem are sent for circle-restricted groups, using a hash of the group ID instead of encrypting the whole item, hense saving a lot of bandwidth on msg sync.
2016-06-12 21:41:09 -04:00
csoler
34f49d4ae8
removed compilation warning
2016-06-11 18:07:07 -04:00
csoler
a07805be1d
moved bandwidth limits to the pgp level
2016-06-09 20:41:27 -04:00
csoler
20b6745f70
added GUI and storage for max up/dn rates per peer
2016-06-07 21:48:22 -04:00
csoler
c2ae4fc904
merged upstream/master
2016-06-05 10:06:11 -04:00
csoler
a2ca0385db
fixed compilation and several problems following separation of public/private keys
2016-06-04 21:39:40 -04:00
csoler
590be092e5
separated RsTlvSecurityKey into two incompatible classes to enforce the correct usage of private vs. public keys
2016-06-02 23:47:57 -04:00
sehraf
4f60c8cc9b
libretroshare: fix comparison between signed and unsigned integer
2016-06-02 14:54:23 +02:00
sehraf
cfc0e7071a
libretroshare: remove unused variables
2016-06-02 14:54:07 +02:00
Cyril Soler
dafb2e6bc2
Merge pull request #396 from csoler/v0.6-Circles
...
V0.6 circles
2016-05-27 17:35:23 -04:00
csoler
59aef8ab7b
added packet slicing for large broadcast chat items, and output warning when chat of serialised item is too big. Also fixed a couple of bugs in the handling of chat packets
2016-05-26 20:33:24 -04:00
csoler
55cb15caa9
fixed updating of membership when loading circle cache entry
2016-05-22 20:35:51 -04:00
csoler
69573d19b4
fixed serialisation of circle subscription requests
2016-05-22 18:49:54 -04:00
csoler
722609a3e6
finished implementing the backend part for the subscription system
2016-05-18 21:13:54 -04:00
csoler
d01c61fde8
added items for encoding subscription requests and the logic to create them from GUI calls
2016-05-11 17:59:42 -04:00
csoler
5ab9aed371
added placeholder service ID for packet slicing probe
2016-04-29 18:40:28 -04:00
csoler
ebf54d1340
fixed unit tests
2016-03-26 17:25:15 -04:00
csoler
d1b09b93b9
removed some debug info
2016-03-25 18:54:13 -04:00
csoler
6a4add8806
implemented per-item encryption and Vetting method compatibility layer
2016-02-20 17:53:03 -05:00
csoler
763108f5fa
debugged transport of encrypted items. Still needs work.
2016-02-15 23:24:18 -05:00
csoler
fd04f0b3bb
updated to upstream/master
2016-01-13 20:27:08 -05:00
csoler
d55993d1e4
removed two instances of malloc(0) captured by new rs_malloc funtion
2016-01-12 21:43:04 -05:00
csoler
d13526facd
added a new method rs_malloc that checks its arguments and prints a stacktrace on error/weird call. Changed the code everywhere to use this instead of malloc. Removed some mallocs and replaced with RsTemporaryMemory
2016-01-12 21:10:11 -05:00
csoler
3094b52e8f
fixed potential integer overflow / Out of bounds read in rsbaseserial.cc. Also added a few more error output.
2016-01-11 19:08:52 -05:00
csoler
ee84ab732d
fixed serialisation error (missing call) for received Distant msg hash map
2016-01-09 10:58:49 -05:00
csoler
0c591f08ae
added auto re-send of distant messages after global router notified the message cannot be sent. Added a map n p3msgService to avoid receiving multiple times the same message.
2016-01-07 22:22:05 -05:00
csoler
9da8a8abc3
fixed compilation of RsNxsTransaction encryption code
2016-01-01 21:37:27 -05:00
csoler
6ecd2991e7
merged with latest trunk
2016-01-01 15:15:19 -05:00
csoler
672ab256d7
added safeguard against absurdly large packets in rsserial.cc and output of the beginning of the packet.
2015-12-27 10:03:07 -05:00
csoler
5d9272055f
merged with upstream/master
2015-12-22 18:33:01 -05:00
csoler
5fcaa36736
fixed some serialising bugs, and added proper notification of observer
2015-12-19 19:00:06 -05:00
csoler
6910ad3695
added stats exchange system to gather number of posts in unsubscribed groups without the need to actually DL the messages (reduced bw a lot)
2015-12-19 17:38:52 -05:00
csoler
7be7233b29
fixed a number of timing issues in rsgxsnetservice. To be tested.
2015-12-11 22:38:17 -05:00
csoler
0c1e6301b3
merged with latest upstream trunk
2015-12-05 16:49:00 -05:00
csoler
9193d3579b
merged with latest master before creating PR
2015-12-04 21:24:51 -05:00
csoler
bca89c63c6
fixed serialisation bug and added new GUI bits
2015-11-25 18:08:53 -05:00
csoler
1347ee4b37
added regular contacts list and method to move RsGxsIds from/into this list
2015-11-19 22:58:28 -05:00
csoler
cb97ce6f72
half-way through GxsTunnel service
2015-11-18 23:56:35 -05:00
csoler
b009c1135f
changed RsGenExchange strategy to use a threshold on reputation when validating posts
2015-10-25 23:45:33 -04:00
csoler
e60ac99994
added bias to reputation score for known and signed ids. Changed computation formula to an exp
2015-10-25 22:54:56 -04:00
csoler
f24bddf6f1
merged with upstream head
2015-10-25 20:42:41 -04:00
csoler
47dd70fbe8
added non selective tracking for GXS messages
2015-10-25 17:26:34 -04:00
csoler
21c31fb446
modifications to item encryption so as to match APIs
2015-10-22 20:24:36 -04:00
Phenom
47c47d144e
Fix Compilation on Win32 after PR#143 merged.
2015-10-12 23:21:17 +02:00
csoler
71c8dfdc58
manual merge before creating a conflict-free PR
2015-10-12 14:45:11 -04:00
csoler
ce96e88925
debugging of reputation system
2015-10-09 17:51:10 -04:00
csoler
bb7a8f2732
fixed some reputation sending bugs
2015-10-08 23:54:18 -04:00
csoler
8c6c9344fe
fixed a few bugs in reputation items serialisation code and GUI display
2015-10-08 23:02:34 -04:00
csoler
b0940890cd
fixed compilation
2015-10-06 22:39:14 -04:00
csoler
9f6bc0c3fc
added code for all reputation items
2015-10-06 00:11:18 -04:00
csoler
1c12178874
finished implementing decryption routines. Still needs fixing compilation
2015-10-01 23:37:50 -04:00
csoler
6626538cab
half way through RsNxsItem encryption
2015-09-27 23:53:55 -04:00
csoler
22d4893721
removed a few compilation warning that might cause compilation errors on some systems
2015-09-24 18:03:19 -04:00
csoler
85e6eca2f0
added serialisation for encrypted items
2015-09-12 16:27:01 -04:00
csoler
d304c7fea6
fixed bug in deserialisation causing the wrong method to be called
2015-09-12 09:37:36 -04:00
csoler
225e8f130b
changed serialisation methods to use c++ in rsnxsitems, added two new items for encrypted data, renamed classes RsNxsSyncGrp and RsNxsSyncMsg to RsNxsSyncGrp/MsgReqItem
2015-09-12 00:39:35 -04:00
AsamK
3cfe69787f
Fix subtle bug in tlv deserialization of TLV_TYPE_KEYSIGNATURETYPE
...
When using -O2, the variable currType is optimized out, so the
signature is added with the wrong sign type. Then when verifying the
data the signature is not found and verification fails.
The main sympton of this bug was receiving no more forum/channel posts.
Wit debug builds (-O0) this worked, that's why not every one was affected
by this.
This bug was introduced in 2012 (19e856c2a8
)
2015-09-02 02:03:46 +02:00
csoler
168eb45539
removed debug info about missing keys; added debug info about deserialization checking of string
2015-08-05 20:51:34 +02:00
csoler
260da99955
improved filtering method against lol bombs. Thx to ConcernedCitizen for pointing this out
2015-07-31 17:27:42 +02:00
thunder2
c76141ed65
Added missing initialization in
...
- pqissl
- pqissludp
- PeerConnectStateBox
- RsTlvBanListEntry
- RsServer
- TcpStream
- PGPCertificateInfo
- peerConnectAddress
- AudioInputConfig
- SpeexInputProcessor
- xProgressBar
- TBoard
Removed unused member:
- xProgressBar
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8611 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-13 11:03:18 +00:00
thunder2
090148cea2
Fixed possible crash in RsGxsIdSerialiser by checking return value of dynamic_cast.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8599 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 01:43:10 +00:00
thunder2
63d85f8077
Fixed possible crash in RsFileTransferSerialiser by checking return value of dynamic_cast.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8592 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-12 00:58:05 +00:00
csoler
249c827f95
improved debug info in a few places
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8584 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-09 20:55:11 +00:00
electron128
d870b13a49
fixed potential integer problems in de-serialization of different TLV items (patch from Henry)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8574 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-07-01 12:17:03 +00:00
csoler
8e0b6b95c5
fixed potential integer problem in image de-serialization (reported by HM)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8568 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-29 12:00:40 +00:00
csoler
e1dcdd78b6
auto-cleaning of strings for types that cannot contain chars < 0x20 by design
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8547 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-23 19:25:13 +00:00
csoler
ab95a6c865
removed debug info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8503 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-16 19:17:52 +00:00
electron128
f5843faef0
added missing size check in RsGxsRecognSerialiser
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8425 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-13 08:03:58 +00:00
electron128
eb7a52a2a7
fixed bug reporting wrong IP for connection (patch from Cyril)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8367 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-04 13:25:19 +00:00
csoler
777c915be2
load/save of banlist comments. Removed unused menu entries. Added auto-fill of input fields on sleection
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8343 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-06-02 13:02:20 +00:00
csoler
bb74d08f33
add/remove from lists. Load/save from user whitelist/blacklist
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8321 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-05-30 20:29:06 +00:00
csoler
20a2d42038
almost done with load/save of BanLists. Changed the item format to include masked_bytes, and changed subitem types. Also disabled code from rsgxsreputationitems.cc wich was a copy of the code from rsbanlistitems.cc
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-05-29 20:49:37 +00:00
csoler
38aefdf62f
first UI prototype for IP ban list system. Not yet usable.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-05-27 21:30:40 +00:00
csoler
1f759c4004
removed a few redundant return statements
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8276 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-05-19 21:29:50 +00:00
csoler
13ff39429e
* Renamed RS_TLVKEY_DISTRIB_PRIVATE into *_PUBLISH, as it is used as such.
...
* Allow to check signatures and validate groups using private keys in GxsSecurity
* removed inconsistency in key flags when full keys where mixed up with publish keys.
This should fix the following bugs:
* channel owners did not receive posts from other peers who have publish rights
* channels sometimes not gettign through
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8275 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-05-19 21:28:46 +00:00
csoler
90d6ac6697
fixed memory leak and potential crash due to not copying items passed to config saving in messages. Added save/load for map between GRouter and Msg ids which fixes the never removed outgoing messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8184 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-04-28 21:46:10 +00:00
csoler
77a33cd445
removed unnecessary debug output
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8153 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-04-21 20:09:20 +00:00
csoler
c9d5c7b3cb
turned some std::list<PeerId> into std::set, as it automatically prevents duplicates
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8138 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-04-17 21:36:22 +00:00
csoler
70918e9dcf
reduced size of output for buggy RsItems
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8111 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-04-03 21:57:24 +00:00
csoler
ae0603a687
added test to prevent using twice the same config file; changed duplicate config file name causing deserialisation errors and loss of some config files; added printout of hex code for RsItems that fail deserialisation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8075 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-25 22:21:01 +00:00
drbob
7cece484c4
Modify Messages with additional namespace - to allow switching to new Mail.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8066 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-22 04:45:01 +00:00
csoler
c4b1b3dfbc
fixed serialisation bug likely causing the loss of peers.cfg (Thx G10H4ck for finding this)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8039 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-16 21:27:35 +00:00
csoler
48ea291d95
moved signature validation and encryption one level up into p3IdService. Added timestamp for GXS identities and auto-removal after 7 days. Updated display in IdDialog
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8015 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-03-14 14:33:23 +00:00
csoler
6e8e5efb90
fixed a few bugs in distant chat protocol (allow re-negociation of DH parameters if decryption fails, correct passing of own gxs id for server side), making the system more reactive. Also fixed the issue of avatar not showing up. Changed the tunnel naming system to something specific to distant chat. WARNING: this version cannot distant chat with previous versions.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7943 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-02-14 20:55:05 +00:00
thunder2
8351510841
Receiving a shared key:
...
- Added notify of the group id and the refresh of the gui
- Added system message (create of message disabled)
- Added possibility to show a news feed item
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7926 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-02-08 01:01:48 +00:00
csoler
7642ba1c1f
added load/save to service permission matrix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7906 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-02-03 21:28:32 +00:00
csoler
8a8f9fc528
added number of posts at friends to saveList/loadList. Improves visibility of number of posts
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7896 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-01-31 18:06:37 +00:00
csoler
e19d2e3c36
re-enabled anti-svg bomb code before some jerk tries to exploit it. It was used for wide strings. Moved it to std::string deserialisation.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7893 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-01-31 12:30:31 +00:00
csoler
481ee246b5
added avatars to identities.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2015-01-25 22:09:12 +00:00
csoler
93f77a0e2c
improved network statistics for GXS net service. Added number of available messages for unsubscribed forums in GUI. Should be done as well for channels.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-16 06:54:15 +00:00
csoler
d4dad8328f
fixed compilation warnings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-16 06:49:42 +00:00
csoler
a5bf3b6f3f
improved/cleaned debug outputs in in rsgxsnetservice.cc. Performed optimization of transaction system: limited the size of message transactions and allowed a much larger transaction timeout to suppress the transaction cancelling epidemic that caused global bandwidth increase and lack of channel/forum propagation
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7724 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-02 20:06:56 +00:00
drbob
6588eafb99
Adding start of new Mail Service.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7723 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-12-02 13:22:48 +00:00
csoler
f6efa2fb92
separated chat items from message items, separated chat into tree components: chat, distant chat and distributed chat (i.e. lobbies). moved all chat components into chat/. Removed deprecated chat items
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7670 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-11-11 16:10:54 +00:00
csoler
9311dc5922
removed unused comparison operators
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7650 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-10-31 21:18:52 +00:00
csoler
d547cb6fdb
changed post fixed operator++ into prefixed. More efficient on some systems. Patch from Phenom.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7630 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-10-24 22:07:26 +00:00
csoler
d0469ccfc3
implemented publish key sharing between peers for channels.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7582 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-10-05 19:14:05 +00:00
csoler
9efc43f41c
Big progress for People dialog. Phenom work.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7573 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-09-28 20:46:56 +00:00
csoler
789e6ae24e
removed some debug info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7542 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-09-16 19:53:23 +00:00
csoler
80f4401e88
- implemented DH protocol for PFS encryption in distant chat between GXS ids.
...
- changed format of keyId in rstlvkeys.{h,cc}, but kept the serialisation for backward compatibility (A #define needs to be removed to fix it for good). Updated rsrecogn, rsmsgitems, gxssecurity accordingly
- added "chat peer" in IdDialog to help testing distant chat.
Distant chat works and is now encrypted. The GUI still needs some smoothing: display of correct peer names
in chat window, remove the need to add a message in p3chatservice.cc:3217 to force poping up the chat window.
- added MsgAddress class to handle generic address types while keeping type separation in Messages. Not used yet.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7403 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-06-12 10:28:23 +00:00
csoler
bfe872118b
- fixed a bug in distant message signature checking
...
- fixed delay problem in not getting uncached GXS Id keys by prior requesting details about the key
- enabled signing by default in MessageComposer
- implemented print() in RsTlvIdSet.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7373 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-05-17 21:36:07 +00:00
csoler
33abca82e5
- removed LinksCloud from plugins (based on obsolete cache system)
...
- removed copy constructor of RsGenericId from std::string as it allowed many inconsistencies and double transforms of IDs from/to strings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-20 16:34:26 +00:00
csoler
ed198af807
- added notification from global router to client services
...
- keep distant messages in outbox until they get notified to be received
- cleanup dead code
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7284 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-19 16:02:11 +00:00
chrisparker126
ef8f48ae73
Added rsshared ptr helper object (only use in test for memory management)
...
Added first nxs_test
modified pserviceserver to allow better dependency injection
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7279 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-18 21:58:14 +00:00
drbob
9f358c5480
fixed printout of nxs items.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7268 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-12 07:25:33 +00:00
drbob
3eb79bbcba
Bugfixes to rsmsgitems & rsserial.
...
removed testing utilites rstlvutil.
fixed up rsgxsiditems printing.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7232 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-05 04:48:52 +00:00
drbob
0dbe55bd05
Fixed serialiser bug in RsTlvList
...
Switched to proper Ids in gxsCircle gxsId items.
Fixed up Config serialiser.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7218 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-04-01 08:00:20 +00:00
drbob
600639db51
fixed up tlv serialisers:
...
- Added RsTvlUnit: public RsTlvItem, which handles some of the infrstructure.
- made TlvSize() SetTlv() and print() const.
- split rstlvtypes into its bits and cleaned up header files.
- added templated RsTlvList, imilar to cyrils id one.
- removed GXS_GEN_TESTNET
- cleanedup rsserviceids.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7215 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-29 15:34:37 +00:00
csoler
1042744685
merged remaining of v0.6-IdCleaning branch (7180->7213) to incorporate global router stuff in trunk
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7214 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-29 14:18:05 +00:00
chrisparker126
5440aec17b
Fixed code issues resulting in excessive warnings
...
Cleaned up GXS code a bit, removed unused functions and types from nxs and serialise items
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7203 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-23 12:13:44 +00:00
drbob
83a78bcaee
Added ServiceControl + ServiceInfo. Basics are working, but still a lot to do!
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7196 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-22 03:53:44 +00:00
chrisparker126
e2c8c6e141
Compilation fix. Rs compiles now, group and message creation work ok, more testing to do still
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7192 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-20 11:26:53 +00:00
chrisparker126
0f29d28b1b
merge of branch v0.6-idclean 7180
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7187 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-17 20:56:06 +00:00
drbob
15449cdc74
added extra parameters to generic map
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7166 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-03-04 10:06:16 +00:00
drbob
1b2ed66814
Implementation of GxsId Opinion, and start of Reputation system.
...
- Removed old reputation system from p3idservice
- Removed old Msg types as well (no longer needed)
- Added real submitOpinion()
- Modified serviceString to support Reputation System.
- Added reputation information to both Cached Data, and Standard ID Data.
- Added basics of new reputation system as alternative service. (not gxs).
- Added Generic TLV types for maps.
- Moved configuration files to their own directory .rs/config/
- Finally, fixed up bits missed from the change to updateGroup!
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7131 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-19 11:08:37 +00:00
chrisparker126
0fd46e4f2b
Added specific IDs to GXS service serialisers
...
NOTE! YOU WILL LOSE CURRENT GXS data!
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7100 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-08 11:13:10 +00:00
csoler
235280399f
- changed Sha1CheckSum from hand-made class to instance of t_GenericIdType<> (should be backward compatible)
...
- updated ft/, p3msgservice and p3chatservice accordingly
- added a new class for Sha1Sum in t_GeneridIdType<>, and an additional template argument to make ids of identical size
incompatible.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 19:10:45 +00:00
csoler
9e23f59e3a
compilation warning fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7080 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 15:26:53 +00:00
drbob
c0738eec7f
Merging branches/v0.6-initdev into trunk.
...
These split at 6672 -> 7075, so quite a bit merge.
libretroshare compiles - but untested.
retroshare-gui needs GenCertDialog.ui and IdEditDialog.ui to be properly merged. (compile errors).
some plugins will be broken.
retroshare-nogui is untested.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7078 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-02-01 14:16:15 +00:00
csoler
e12929d9d7
Added connexion to the msg system and fingerprint into grouter addresses. flushing current changes before 0.6 merge.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7072 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-30 22:14:37 +00:00
csoler
f198f9c784
removed potential uninitialized memory read in TlvKey item.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7054 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-24 13:39:55 +00:00
drbob
ae5942733e
- Split majority of p3posted into p3postbase.cc - so that it can be reused by other services.
...
- Fixed iterator overflow into rsgxsupdateitems.cc
- Fixed Mutex deadlock in pqiperson.cc
- Removed old code.
- Fixed lots of compile warnings - mainly wrong variable ordering in constructors.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7044 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-20 11:42:27 +00:00
chrisparker126
f3afc128ee
Chozabu patch
...
- New db created for parent group id field, you will all previous gxs data
- posted now support sub post topics
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@7042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2014-01-19 23:38:48 +00:00
csoler
da1b6ac845
added serialisation methods for SSLId and time_t
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6969 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-27 20:02:25 +00:00
chrisparker126
8aca56bc4f
merge fix
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6954 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-21 19:27:48 +00:00
chrisparker126
39909b705f
merging rs_gxs-finale to v0.6 branch
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6953 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-21 18:20:47 +00:00
chrisparker126
dab782fbaa
Fixes for gxsupdate item serialisation
...
- now works
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs_finale@6947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-12-15 20:11:39 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
csoler
c201c0470c
removed compiler warning
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6597 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-23 20:03:34 +00:00
csoler
e763f46aee
fixed saving of MsgItems for distant messages. Reworked RsMsgItem class hierarchy to remove explicit overloading by callign dynamic_cast
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6556 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-04 20:09:26 +00:00
csoler
dc7003bd92
Added signature verification in distant messages. Decrypted does not always work due to openpgp limitations.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6551 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-08-02 23:00:36 +00:00
csoler
14890ef007
added ACK system to make sure the secured tunnels for distant chat are actually working, before one starts using it.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6502 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-07-14 13:59:38 +00:00
csoler
7414659bd9
Patch (modified) from Phenom to allow auto-subscribe to chat lobbies
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-29 16:15:33 +00:00
csoler
ff544da72e
added proper tunnel closing mechanism with notification of the talking peer, and popups to inform the chat participants
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6430 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-13 21:12:07 +00:00
thunder2
a304ffbab7
Fixed some compiler warnings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6419 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-09 17:54:54 +00:00
csoler
dc2521cf71
Merged branch v0.5-GenericTunneling into trunk (Rev. 6284 to 6410).
...
- adds turtle router as a generic tunneling service
- made ftServer a client of the service. Now turtle file items are handled in ftServer
- added new client: p3MsgService to send/recv pgp-encrypted distant messages
- added new client: p3ChatService to perform private (AES-encrypted) distant chat through tunnels.
- The GUI is disabled for now, since it needs some polishing before being fully usable.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-06 19:58:30 +00:00
chrisparker126
325fa4f222
merging gxs_phase2 branch
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6401 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-04 21:00:43 +00:00
csoler
c2fa746991
added choice for default auto-download directory per channel.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6376 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-23 21:47:50 +00:00
csoler
a8d4c02a6e
save/load public msg invites. Small bug fixes.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6358 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-05 19:13:27 +00:00
csoler
6f769b3b54
added message encryption for distant msgs. Still missing decryption.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6351 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-03 21:02:44 +00:00