Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-27 00:19:25 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,830 Commits 63 Branches 22 Tags 196 MiB
299678b9c8
Commit Graph

5830 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
csoler
cb9f174efa added tunnel state light to distant chat popup dialog. Added proper peer name. Changed method for adding widgets in the chat bar 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6337 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 22:43:19 +00:00
thunder2
05f8b15cfe Added missing file "stream.proto" to the automatic generation in retroshare-nogui.pro. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6336 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 21:43:24 +00:00
drbob
f02383f5d6 from retroshare/code/branches/v0.5-rpc-b1 
--- Merging r6107 through r6332 into the rest of retroshare.

Updated version of RPC protocol with fancy new features like:
 - streaming.
 - add / remove friends.
 - file listings.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6335 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 21:10:34 +00:00
drbob
9e091c16b6 from retroshare/code/branches/v0.5-rpc-b1 
-- Merging r6107 through r6332 into 'libretroshare':



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6334 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 21:05:55 +00:00
thunder2
7810e7ace3 Added patch from Henry Morgan 
Fixed some typos.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6333 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 20:41:39 +00:00
defnax
322c3e70a1 Added a info Label for the Friend Request Page 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-23 15:19:58 +00:00
drbob
1f01eda2e2 Added missing rpcprotoutils file. 
Updated files RPC with TransferState



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6331 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 22:43:02 +00:00
drbob
19ac059ad2 Added Transfer State to RPC messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-rpc-b1@6330 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 22:40:30 +00:00
thunder2
dd0ef691c5 Fixed online time in profile widget. 
Fixed width of settings dialog.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6329 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 21:12:38 +00:00
csoler
6ddfe35353 removed display of link hash. not useful to the end-user 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6328 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 20:59:13 +00:00
csoler
2485f9fffd added saving of ongoing chat invite links. Fixed a deadlock 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6327 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 20:49:58 +00:00
thunder2
fea35e1e3c Updated english translation. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6326 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-22 16:34:03 +00:00
csoler
1e5a7a057c added lots of debugging info. Fixed stupid bug supplying wrong AES key. Distant chat works! 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6325 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 22:20:11 +00:00
thunder2
6be253e9f8 Fixed sending of status typing in chat. Modifier keys does not send typing anymore. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 20:18:58 +00:00
csoler
5657ab9796 bug fixing. Apparently still problems with AES padding. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6323 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 19:16:25 +00:00
thunder2
be34ede8fd Enabled history for chat lobbies (not saved to disc) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6322 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-21 16:43:49 +00:00
csoler
1c3ff8c54b - lots of debugging. 
- added missing bits to turtle router for better handling symmetric traffic 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6321 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-20 18:56:06 +00:00
chrisparker126
c5c559ffe1 Fixed sql injection bug using sqlite prepared statements. 
added more doc detail to contentvalue (put takes private copy of data).
binds to content pointers take private copy of content.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6320 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-20 13:39:02 +00:00
csoler
56e71b51fa added notifications so that the distant chat window pops up 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6319 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 22:24:25 +00:00
thunder2
533d1f429a Added new icon for news feed from Agurer. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6318 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 21:30:50 +00:00
csoler
1dd8e9067f patch (from Henry Morgan) to make the tooltips translate-able in the group flags widget 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6317 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 21:09:05 +00:00
csoler
ae5e1c7ae5 reverted last commit. Fixed the perm bug in ConnectFreindWizard (Patch from Henry Morgan) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6316 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-19 11:54:39 +00:00
csoler
ff867d0fe5 most of the protocol for distant chat works! Still needs some testing. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6315 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 21:41:13 +00:00
csoler
d4a7c9ce2e added key id to help signature verification 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6314 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 19:25:45 +00:00
csoler
3240b1f71b patch from Henry Morgan to use ConfCertDialog rather than connectFriendWizard from Security item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6313 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 18:54:53 +00:00
csoler
be795e4dd2 made passwd box modal 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6312 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 18:41:51 +00:00
chrisparker126
f0b31371f7 potential solution to SQL injection bug using radix64 enc/dec. 
-disabled for now (RADIX_STRING to enable), causing segfaults for no obvious reason, works on offline code. 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6311 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-18 17:26:37 +00:00
csoler
dc0193ae66 added popup chat window for distant chat, decryption code for private chat links. (W) does not compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6310 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-16 21:13:42 +00:00
csoler
c2fcd8bc71 patch from Henry Morgan to avoid removing peer permission flags when removing locations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6309 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-16 20:10:31 +00:00
thunder2
6590167475 Fixed compile with disabled Circles and PhotoShare. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-15 09:23:24 +00:00
csoler
46ec44ceea fixed some display bugs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6307 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-14 21:45:02 +00:00
csoler
5a889eb1cd added method to get list of existing private chat links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6306 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-14 15:05:24 +00:00
csoler
e7871b598b added code to create/paste/read private chat and msg links 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6305 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-13 22:40:17 +00:00
csoler
9e8b9b6c05 added first brand of chat/msg link creator/editor. Not functional yet 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6304 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-13 13:12:13 +00:00
csoler
35994e7197 changed priority for forwarded turtle traffic. The priority was so low that it explains why tunnels of length > 2 are so slow 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6303 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-10 21:44:33 +00:00
csoler
d0703df7e3 basic gui entry for creating a chat link. Fixed a few bugs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6302 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-10 21:21:52 +00:00
csoler
43b9117293 - added creation of chat link info 
- added binary data encryption to PGPHandler



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6301 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-10 20:28:13 +00:00
csoler
f12ad9583d - added functions to add/remove virtual peers in turtle client service 
- removed all explicit connections between turtle and FT
- added tunnel and invitation management in p3ChatServer (still needs PGP encryption)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6300 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-10 08:52:52 +00:00
csoler
e9a51455eb added crypto functions and msg sending/receiving for private distant chat 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6299 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-08 21:25:32 +00:00
csoler
86ebfc5d2b calling the right function to get permission flags 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6298 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-08 19:55:21 +00:00
csoler
cd2d702e44 fixed bug in aes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6297 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-07 15:07:13 +00:00
csoler
66de50508b added aes symmetric cryptography, based on openssl library 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6296 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-07 14:39:46 +00:00
csoler
5e62f6c0c5 added serialisation/deserialisation and handling of generic tunnel data items 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6295 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-06 13:58:27 +00:00
csoler
6760b35ae6 fixed a few bugs related to previous commit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6294 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-06 13:16:54 +00:00
csoler
0abb21d962 Added ability for turtle router to take client services 
- new class RsTurtleClientService, from which should inherit the services
- turtle serialisation takes client services for deserialising
- added a client to p3turtle::monitorTunnels()
- added a generic turtle item to pass on arbitrary data

Moved ftServer as a subclass of RsTurtleClientService. 
- moved file transfer items that inherited from RsTurtleGenericTunnelItem into a separate file
- moved deserialisation triage into ftServer
- moved sending/receiving methods in ftServer (much less code, much more consistent!)

One bug remains: the TR cannot work as a server.

Changes should be 100% backward compatible.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6293 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-06 09:21:01 +00:00
csoler
bc463a0f81 fixed remembering flags for own id, tentatively fixed service perm bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6292 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-05 21:11:27 +00:00
chrisparker126
9a37bde4c8 user test version 
- disabled circles and photoshare

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6291 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-04 17:23:10 +00:00
csoler
7c34736f56 removed debug output (pritned only once now) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6290 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-04 13:14:59 +00:00
csoler
3e86fc0640 removed unnecessary debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6289 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-04 13:12:00 +00:00
csoler
970e83ead3 fixed bug in p3peer.cc not calling the correct method 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6288 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2013-04-04 13:10:26 +00:00