Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-23 22:49:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,530 Commits 63 Branches 22 Tags 196 MiB
cfcd773d6e
Commit Graph

595 Commits

Author SHA1 Message Date
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
8628be3b35 add a break in case ipAddressList don't deserialize correctly 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1891 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-15 17:50:18 +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
73d92b4a68 add info to gui 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1889 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-15 17:47:43 +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
defnax
263456d54c removed unused server directory 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1887 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-15 16:05:24 +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
908a6e1891 add debug info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1885 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 21:21:51 +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
b7ace087e6 remove DHT from rsInit 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1881 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 18:10:49 +00:00
joss17
35631d180e add ifdef for debug logs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1880 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 18:10:34 +00:00
joss17
3cac0c1ce9 add ifdef for debug logs 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1879 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 18:10:20 +00:00
joss17
df5d249dd1 code cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1878 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 18:10:05 +00:00
joss17
c71306681e code cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1877 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-14 18:09:46 +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
csoler
b6c048a5fd Implemented load/save of chunk maps for current downloads. 
The side effect is that even when stopped, downloads show the correct downloaded size (up to the size of one chunk).



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1865 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-10 22:55:27 +00:00
csoler
4d190963cf windows compilation fix 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1864 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-09 12:42:31 +00:00
csoler
25a09900e9 - Added a ChunkMap class responsible for allocating new chunks to be downloaded, according to 
- a given chunk strategy
	- the availablility map of each source 
- Integrated this into ftFileCreator
- added gui menu in file transfer+right click to change the chunk strategy: streaming vs. random

Next step: 
	- loading/saving file downloading state and availability map
	- displaying chunk details in the selected transfer tab (e.g. list of currently worked chunks, and their current downloading completion)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1863 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-08 22:29:52 +00:00
defnax
de0cbd50ce fixed libretroshare.pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1862 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-12-06 12:08:59 +00:00
csoler
426fc06938 forgot to add these two files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1839 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-19 08:35:11 +00:00
csoler
e88d2c1928 Added consistent display of chunk map 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1837 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-18 23:02:37 +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
csoler
506f14eb2f - Added a parent page widget (class RsAutoUpdatePage) to handle auto-update. The page updates using a timer, only wh 
en visible, and each time it gets showed. I already made some RS pages derive from this page.
- Modified and renamed the taskGraphPainterWidget to display info about currently selected file transfers. For know, it only shows file chunks info, but we should use it to display additional info about the transfer. Warning: in its
 current state, only fake chunk info is displayed.
 - Suppressed p3files.h, because it is not used.

 Remains to do (in order):
 - Implement a chunk map class in ft/ to properly manage which chunks should be downloaded 
 - Display correct chunk info by requesting the transfer's chunk map
 - Add check-sum verification of chunks
 - allow RS to import a partially downloaded file by force re-checking chunks
 - Add chunk map exchange from file source peer id to file destination peer id.
 - Manage chunks from different peers.
 - Allow search (turtle search) for partially downloaded files 



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1832 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-17 12:45:06 +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
f56e9cfcd9 fix log output with ifdef 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1818 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-12 17:16:06 +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
joss17
a444484734 fix a bug when closing RS for upnp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1803 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-10 17:17:05 +00:00