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

123 Commits

Author SHA1 Message Date
joss17
5349ab101a Revert "Ad a friend right upon connection when necessary. Removed two core mutex to do that, it might be dangerous, we will see" 
This reverts commit 430b13ab7d12b0911e072887c8347b6855d173af.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2042 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-14 22:50:27 +00:00
joss17
e2cc7213a3 Ad a friend right upon connection when necessary. Removed two core mutex to do that, it might be dangerous, we will see 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2037 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-14 01:33:56 +00:00
joss17
a51df4ba6b accept own locations 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2034 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-14 00:38:36 +00:00
joss17
018b84a1e1 change the design of the connect friends wizard 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2023 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 21:30:44 +00:00
joss17
c6edff7df8 change the cert to gpg + some ssl details 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2022 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 21:29:21 +00:00
joss17
72d9eb2aef solve a bug in the load list af connect mgr 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2020 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 21:27:07 +00:00
joss17
e50dc4e3b9 implement dummy friend for a gpg key, improve PersDialog ui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2018 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 21:25:18 +00:00
joss17
9976b80566 remove the ssl cert storage. Big rewrite of ssl cert and friend management 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2017 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 21:22:52 +00:00
joss17
bb45fa3db5 working gui version for peers dialog 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2013 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 21:16:18 +00:00
joss17
6055c30832 code cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2006 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 21:03:36 +00:00
joss17
9d53481946 make it run 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2003 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 21:01:06 +00:00
joss17
a0a64fb588 make it compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2002 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 20:58:58 +00:00
joss17
c23407cae3 get rid of p3authmgr 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2001 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2010-01-13 20:56:55 +00:00
joss17
bccd4e7d22 don't add an external address if we are not reachable with it 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1934 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-22 18:43:04 +00:00
joss17
e708cf4257 don't do a tunnell connect attempt when already connected through a tunnel 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1931 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-22 12:30:28 +00:00
joss17
106645f5e5 start listener not immediately after net reset to avoid connection flickering. Stop listeners is here but not implemented 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1924 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-20 13:27:46 +00:00
joss17
d485c71126 The external ip address is now set when a peer is connected if there is no upnp or extadrfinder 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1918 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 23:35:57 +00:00
joss17
cc6b480156 improve address list config serialization 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1916 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 23:35:25 +00:00
joss17
335e2e6d71 start peer connection 6 sec after net reset 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1913 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 23:34:34 +00:00
joss17
76c774a76a upgraded connmgr and p3disc for ext address ip detection when connecting to peers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1912 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 21:45:45 +00:00
joss17
10cd455519 add some various tests to avoid ip address 0 bugs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1910 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 21:45:13 +00:00
joss17
2d8f30c2c7 ensure that local address is not 0.0.0.0 or port is 0 in the connect manager 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1909 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 17:52:50 +00:00
joss17
7efc0ef9b7 verify that ext addr is not 0 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1908 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 17:52:26 +00:00
joss17
5f7bc6e69d change debug output 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1905 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 17:51:40 +00:00
joss17
4a53fdc0a9 change the way we handle our own address when recieving a disc item 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1901 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-18 17:50:33 +00:00
joss17
00edab16d9 fix a bug when connected through a tunnel 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1895 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-17 22:21:51 +00:00
joss17
cfcd773d6e fix a bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1893 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-15 22:04:50 +00:00
joss17
7ca2b01791 fix a reconnection bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1892 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-15 21:50:45 +00:00
joss17
83db3bebb9 add current local and external address to ip list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1890 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-15 17:48:48 +00:00
joss17
4f25178d47 improve extract of external ip address from the ip address list 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1888 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-15 16:56:58 +00:00
joss17
2b52db6c47 rework a little the netCheckConsistency 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1886 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 21:59:15 +00:00
joss17
8e4ce11532 work on the timeout for tcp and udp connection 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1884 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 21:20:17 +00:00
joss17
6f0e7de534 fix ext address peer detector 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1883 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 18:46:08 +00:00
joss17
76d5072624 add ext address detector when connectiong to peers 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1882 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 18:11:19 +00:00
joss17
34c4e500e4 fix a bug in the udp timeout 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1875 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 13:59:25 +00:00
joss17
cd01b0df43 DHT disabled 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1872 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 13:46:38 +00:00
joss17
b447a213ea perform a net reset when network config is changed 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1871 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 13:46:23 +00:00
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
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
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