csoler
90b5e76f25
fixed bug in anti-search-by-depth mechanism; removed some compiation warnings
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6416 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-08 20:48:02 +00:00
thunder2
9fcb18553a
Fixed crash with Windows compile.
...
Renamed method "RsFiles::CopyFile" to "RsFiles::copyFile" (lower case) to avoid renaming of "CopyFile" to "CopyFileW" with the newly included "windows.h".
From windows.h
#define CopyFile CopyFileW
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6415 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-08 20:03:29 +00:00
csoler
f6509bef31
only add direct sources that have flag for direct DL enabled
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6412 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-06 20:52:24 +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
csoler
264f92cf15
disabled debug info
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6409 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-05 19:55:10 +00:00
csoler
900abd0f54
fixed compilation of network simulator
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-05 19:54:34 +00:00
thunder2
faac2987db
Revert changes for Windows compile in libretroshare.pro after merging gxs_phase2 branch.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-05 14:19:21 +00:00
csoler
9c69ad0500
added a new per-friend flag to allow to seek for direct transfers. Disabled for existing friendds (should be added manually), enabled by default for new friends
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-05 12:57:11 +00:00
csoler
ef2ebcc1d6
removed unused code
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6405 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-05 12:55:48 +00:00
csoler
451dc2da5e
disabled gxs by default in libretroshare to be consistent with rs-gui
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6404 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-05 12:11:46 +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
6914897584
fixed destination directory when downloading channel items in auto DL mode
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6396 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-01 12:33:54 +00:00
csoler
e11f60150c
improved error handling, and ensures that keyring is always kept consistent
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6395 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-31 19:16:04 +00:00
csoler
4b21232beb
fixed bug potentially causing keyring corruption.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6394 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-31 17:33:20 +00:00
csoler
554234d385
no time stamp when merging from disk without signature modification
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6393 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-31 12:42:16 +00:00
csoler
465420c59c
fixed update of time_stamps for keys from disk
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6391 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-31 08:13:16 +00:00
csoler
58319bc8ff
fixed default initialization of time_stamps for keys
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6390 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-31 07:30:05 +00:00
thunder2
df9ff91c3f
Fixed compile under Windows.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6388 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-30 21:13:55 +00:00
csoler
b4f26dcf8f
fixed bug due to not using realloc correctly (thanks valgrind)
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6385 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-30 19:43:05 +00:00
csoler
0d3d8ed2bd
fixed uninitialized memory read
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6384 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-30 18:26:50 +00:00
csoler
0266329dc8
- Added a drop-down item to allow removing unused keys, in the Network dialog.
...
- added key removal method in OpenPGP-SDK
- improved FriendSelectionDialog/Widget to enable select all/none keys, and show non friend keys
- added safe key removal method in PGPHandler. Removed keys from other locations will not cause errors.
- added backup system to public keyring, impossibility to remove public parts of owned secret keys, etc.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6382 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-29 21:32:02 +00:00
thunder2
3a8a8c1e64
Removed unused member mChanReadStatus from p3Channels.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6378 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-24 14:57:33 +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
2986e81f7e
added ability to keep track of when keys have been last used for signature check, signing and encryption, so that we can later detect which keys are unused and get rid of them
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6374 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-21 22:38:00 +00:00
csoler
182e536061
removed debug messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6364 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-08 16:58:22 +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
cc6555b93f
fixed cleaning of attachment
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6357 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-04 22:15:05 +00:00
csoler
ec7f992834
added message decryption on right-click for distant messages
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6356 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-04 22:03:48 +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
csoler
7708e6cd93
first working version of distant messages. Still needs some smoothing.
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6348 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-05-01 21:13:40 +00:00
csoler
34e6fb6fa2
fixed a few gui issues with acceptance of unknown peer
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-29 22:32:58 +00:00
csoler
ca279ec0c2
first version of distant messages. Still needs some debugging
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-29 20:44:48 +00:00
csoler
6a88d7382a
added mssing state change
...
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-GenericTunneling@6338 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-04-23 22:53:00 +00:00
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
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
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
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
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
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
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
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
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