Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,183 Commits 63 Branches 22 Tags 194 MiB
294f4207ed
Commit Graph

830 Commits

Author SHA1 Message Date
csoler
f8d6590952 ported v0.5.0 commits 2561,2562 and 2574 to trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2575 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-17 15:34:36 +00:00
joss17
0fd8b4d4ee improve the recieving of bad gpg keys 
Conflicts:

	libretroshare/src/services/p3disc.cc

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2555 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-15 19:11:33 +00:00
joss17
f5a616519c avoid sending bad gpg cert in p3disc 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2554 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-15 19:10:46 +00:00
csoler
cc17744ee3 ported branch v0.5.0 commits 2529 and 2544 to trunk 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2545 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-15 12:57:08 +00:00
joss17
a4d1e61aa2 increase udp ttl 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2543 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-14 19:48:43 +00:00
csoler
ef67dbf244 fixed win32 compilation pb 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2537 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-13 12:24:14 +00:00
joss17
73615104a7 change ssl binary encryption to aes debug code 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2528 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 23:10:01 +00:00
joss17
10205473fc change ssl binary encryption to aes 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2527 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 23:09:46 +00:00
joss17
43fe49e8b4 lower connection attempt timings 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2526 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 23:09:32 +00:00
joss17
936f0f88cb put UPNPBase under LGPL 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2525 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 23:09:17 +00:00
csoler
c22799b996 moved removal of sources off turtle mutex to avoid cross-lock. Added a closeFile() call when moving files out of the queue 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2523 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 19:39:23 +00:00
chrisparker126
596940400d Fixed original mistake 
- changed bob's logic by mistake hence configs file were not being written 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2522 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-12 15:37:48 +00:00
csoler
5e0c8e062e bug correction: avoid reading deleted pointers by moving saveDone() after the next line 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2519 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-11 14:14:55 +00:00
joss17
a208efdaf9 fix a bug in the double file configuration loading 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-10 16:19:28 +00:00
joss17
63c41801c9 error message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2512 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-10 16:19:05 +00:00
chrisparker126
6054890725 Fixed config forward compatibility problem 
- note to self: C++ binary file not same as C binary file 

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2510 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-10 14:08:52 +00:00
csoler
5f7486f160 added proper dynamic suppression of sources from chunkmap, and updated the gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2498 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-07 14:42:13 +00:00
csoler
144669e672 suppressed debug msg 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2494 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-06 23:37:42 +00:00
csoler
9e469d8baf Added proper dl queue behavior 
- suppressed old DwlQueue class
	- turned mDownloads into a list of pointers to allow easy cross-info update between queue and std::map of downloads
	- added queue functionality for moving files top/bottom/up/down
	- added the necessary functions in rsFiles

Put back display of exact sizes in FileTransferInfoWidget

Suppressed some warnings.

**Warning**: this commit requires a make clean.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-06 23:29:47 +00:00
joss17
da095482db restrain ip list exchange in an attempt for bug solving 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2490 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-06 17:34:04 +00:00
joss17
aa7bed984f small update of connct mgr and ssl connection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2489 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-05 21:27:42 +00:00
defnax
aae699b313 removed old instructions from readme 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-04 11:27:34 +00:00
joss17
5ed5e8eb92 small change in ext address detection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2477 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-03 21:09:49 +00:00
chrisparker126
6ab15c8f83 Added new 2-pass save method to configuration management 
- essentially if any part of the file saving procedure fails, there should be config files whose signatures/hash match up

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2476 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-03 18:20:24 +00:00
joss17
235d468ef4 disable the extract failed certificate 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2474 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-02 22:36:27 +00:00
joss17
9fbf62e901 make the gpg key list reading a little more error proof 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-02 22:35:49 +00:00
joss17
6931a25b45 change the pointer offset cast 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2472 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-02 21:54:30 +00:00
joss17
364a3252f0 Revert "removed c style void* pointer-arithmetic with explicit cast" 
This reverts commit 548b11fc191e258be6ef45544927101596a5a1d8.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2471 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-02 21:53:16 +00:00
csoler
e3f2f66702 suppressed bug in file transfer while removing inactive chunks. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2468 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-01 20:46:29 +00:00
csoler
1904c05bf9 added initialisation of gpgmeKeySelected. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2467 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-01 20:42:17 +00:00
csoler
7b183f41a1 suppressed deadlock (mutex explicitely locked before thread exit) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2466 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-03-01 20:35:32 +00:00
chrisparker126
6b3ab2996a removed c style void* pointer-arithmetic with explicit cast 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2460 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-28 13:28:17 +00:00
joss17
0d524d968b small fix xhen loading detail from a string cert 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2443 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-26 23:43:40 +00:00
joss17
6f651c4a3c small change in p3disc logs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2441 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-26 23:43:10 +00:00
joss17
8f315a52cc remove a (useless ?) buggy quote in qmake file for mac section 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2440 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-26 23:42:52 +00:00
csoler
b50b33b573 cleaned the code in fimonitor, modified the order of file hashing, and put a more explicit progress message while hashing. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2438 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-26 23:05:07 +00:00
joss17
bba533a392 disable the ssl cert config persistance 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2436 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-26 16:43:08 +00:00
joss17
2fd91a5b71 corrected a debug message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2430 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:44:43 +00:00
joss17
a228503d0e add the tunnel config to server tab, and activate the tunnel on fresh configs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2429 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:44:27 +00:00
joss17
3d33f5d729 reimplemented the tunnel handshake 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2428 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:44:04 +00:00
joss17
47b5f62aeb update implemention for new ssl encryption 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2427 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:43:36 +00:00
joss17
57e2e94f8f update log of p3tunnel 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2426 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:43:20 +00:00
joss17
be5957742c remove some exit(1) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2425 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:43:04 +00:00
joss17
5de1f4db50 implementation of an SSL binary encryption 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2424 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-25 22:42:42 +00:00
csoler
a6c585090a oups. backward commit this change which I done yesterday by mistake 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2420 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-24 21:39:23 +00:00
csoler
e4a508ab5b warning suppression 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2411 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-23 22:30:51 +00:00
joss17
80b44220fb Properly close ssl connection when receiving error SYS_CALL. Bug solved 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2410 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-23 22:27:09 +00:00
csoler
3d11b15490 warning suppression, removed unused p3portservice from compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-23 22:17:06 +00:00
csoler
ede337b7d4 suppressed unninitialisez memory reads 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2407 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-23 21:55:44 +00:00
csoler
5acc8411e5 warning suppression 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2406 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-02-23 21:55:29 +00:00