Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-17 11:54:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,507 Commits 63 Branches 22 Tags 195 MiB
274479bc41
Commit Graph

196 Commits

Author SHA1 Message Date
joss17
892598d6eb change the address selection of udp connection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1869 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 10:34:57 +00:00
joss17
fdb3673ce2 Add the tunneling connection. Warning, encryption is not implemented yet for tunnel connection, use only for testing. 
Redesign the udp connection
Remove the rsiface duplicates from retroshare-gui.
Add some randomness in timings for connect manager

Merge branch 'connectionTunneling'

Conflicts:
	libretroshare/src/libretroshare.pro
	libretroshare/src/pqi/p3connmgr.cc
	retroshare-gui/src/RetroShare.pro
	retroshare-gui/src/rsiface/rsfiles.h
	retroshare-gui/src/rsiface/rstypes.h

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1867 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-13 21:59:26 +00:00
joss17
adbdb51c5d removed unused code and logouts, redesign the initial connection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1836 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-18 17:46:38 +00:00
joss17
36c2a726fa check to see a peer is connected before doing a net reset. Don't do a net reset when a loopback interface is used. Set netFlagOk down when on a loopback interface. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1831 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-16 10:53:17 +00:00
csoler
e18167a07a forgot to commit this 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1824 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-14 21:54:43 +00:00
csoler
e77064eaf1 removed deadlock by replacing lock() by trylock(). As a result sometimes, authGPG::getDetails() may return false. As soon as it is used by the GUI only, it shoul dbe ok. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1823 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-14 20:20:33 +00:00
joss17
6a48284c31 remove a deadlock 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1822 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-14 11:59:50 +00:00
joss17
573e7b2474 remove upnp mapping before adding new ones 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1821 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-12 22:19:45 +00:00
joss17
8168be6828 less call to extFinderAddr 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1820 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-12 22:19:25 +00:00
joss17
874d9f45fa fix a bug when removing 1 from a zero siglen 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1817 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-12 17:14:50 +00:00
joss17
5a2dbc4bdf simplified and improve ip list for connect attempt. Show the ip in the gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1816 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-12 11:51:27 +00:00
joss17
6a656eeabc add port filtering if 0 for address list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1813 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 22:13:07 +00:00
joss17
e0543329ad add address list to gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1812 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 22:12:50 +00:00
joss17
d2f9f1c4f1 final code, working on local machine 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1811 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 16:49:11 +00:00
joss17
020bb73665 add the ip list to the connect attemps 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1810 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 16:47:54 +00:00
joss17
fcea2d3a24 implemented the ipAddressList methods 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1809 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 16:47:10 +00:00
joss17
864c504eb4 dummy implementation of the peerConnectState ipAddressList methods 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1808 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 16:46:28 +00:00
joss17
f85adf7c25 change to only one ip list instead of one local and one remote 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1807 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 16:45:46 +00:00
joss17
9a6ff52da1 add the serializing of ip adress list, and the process to ad ip to the list when a connection is made to a peer 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 16:44:51 +00:00
joss17
74e20960c2 remove log output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1805 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 16:44:22 +00:00
joss17
00361c22a5 first commit, change some members name from localaddr to currentlocaladdr, and add ip lists in the classes. Not used yet to connect or exchange 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1804 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-11 16:43:51 +00:00
csoler
10dcad632a setup reconnexion time to 5 seconds after reset 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1798 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-06 22:56:01 +00:00
csoler
1ac3eee9fe added reset of current connexions and force-reconnect when network configuration changes. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-06 22:42:41 +00:00
csoler
ad96c86f68 Added dynamic local and external ip reconfiguration. I still need to reset connexions when changing ips. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1796 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-06 22:12:58 +00:00
csoler
7c1288411a made the passwd dialog call Qt-independent (thanks to notifyBase) 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1793 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-05 19:38:10 +00:00
joss17
3fc211ab15 Add a QTDialog for the gpg key passphrase input 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1790 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 21:26:35 +00:00
joss17
6fba28ee0d Solve windows gpg bug and modify windows .pro project files qtcreator 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1787 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:46:58 +00:00
joss17
7b7846f22f windows compilation fix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1784 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:45:57 +00:00
joss17
62111d00ca change timer and fix log messages 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1780 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:44:44 +00:00
joss17
4295eee208 change timers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1779 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:44:24 +00:00
joss17
95888fed59 add a timeout to ext addr finder 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1778 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:44:04 +00:00
joss17
60210e786b add extAddressFinder tick search 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1776 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:43:31 +00:00
joss17
ff87287af4 add logs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:42:44 +00:00
joss17
b99b99f0d5 Bug which causes net reset solved 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1770 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:41:55 +00:00
joss17
2e5130a1da rewrite connection manager 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1769 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:41:24 +00:00
joss17
cf157422f5 improved stun check 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1767 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:40:31 +00:00
joss17
3d82d40a96 add debug log for connection manager 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:39:59 +00:00
joss17
81e1978a83 store exaddr from upnp to stun 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1763 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:39:26 +00:00
joss17
3c7f714650 improved stun failure resistance 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1761 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:38:52 +00:00
joss17
f090ee87b6 add network reset ehancement for stun and udp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1760 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:38:37 +00:00
joss17
432311d5c3 small udate 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1758 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:38:02 +00:00
joss17
54276344ad add reset net status when shutingdown 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1757 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:37:45 +00:00
joss17
7a7a4fc8d7 better flag management 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1755 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:37:12 +00:00
joss17
20cff8ecbd add loopback network interface compatibility 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1754 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:36:56 +00:00
joss17
938c2edef2 removed unimplemented tcp flag 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1751 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:35:59 +00:00
joss17
324b51e250 improve udp stun and upnp collaboration 
Conflicts:

	libretroshare/src/libretroshare.pro

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1749 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:35:12 +00:00
joss17
b6c2b6897a add gpg engine name log output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1743 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-28 21:10:35 +00:00
joss17
c00928a349 change back the engine setting. Now it should work with gpg1 and gpg2 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1740 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:50:30 +00:00
joss17
62452ed3c5 add gpgme error output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1737 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:48:11 +00:00
joss17
8a67100ebf set gpg2 engine for gpgme 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:46:56 +00:00