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
1,575 Commits 63 Branches 22 Tags 194 MiB
6a10ca6daa
Commit Graph

633 Commits

Author SHA1 Message Date
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
csoler
c046f76934 display the best available ip for peers in the gui, instead of 0.0.0.0. This does only affect the gui, not the way ips are trusted and propagated. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-07 22:06:12 +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
joss17
ef78f90225 fix an upnp bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1795 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-05 20:56:16 +00:00
csoler
37adbae4c1 suppressed unused include of p3files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1794 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-11-05 20:16:14 +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
6e225dec47 Change the unix to linux-* qtcreator files 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1789 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 01:41:16 +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
49b24c2b14 add compilation swtich : libupnp for linux and miniupnp for windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:46:36 +00:00
joss17
e0d7178089 remove unused include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1785 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:46:11 +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
5d6f6f00f4 initialization of a variable 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1783 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:45:40 +00:00
joss17
cabf6260c2 fix uninitialized pointer fir libupnp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:45:25 +00:00
joss17
0497666009 fix a escape character ug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1781 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:45:03 +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
c517e42f25 change log message 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1777 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:43:46 +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
8d1b4aff72 improved log info 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:43:00 +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
3e395f5df4 code cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1772 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:42:31 +00:00
joss17
3ab1b5bb3f improving safe upnp shutdown 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1771 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:42:13 +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
a20d09f0f4 remove define P3DISC_DEBUG 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1768 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:40:47 +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
06c1c0f59f improve time for initialisation of upnp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1766 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:40:15 +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
6eaf201120 improve the async action and getStateVariable 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1764 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:39:43 +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
fcaae207ef action are passed async 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1762 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:39:06 +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
1d5c11c65b add debug info to upnp 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1759 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:38:19 +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
7fa24f4726 add error log for constructor 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1756 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:37:31 +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
04ecbc5514 add new method for external upnp address 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1752 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:36:14 +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
32ea1bfd0f remove unimplemented tcpOk flag 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1750 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:35:44 +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
e7273b0453 change the getStateVariable method 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1748 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:34:51 +00:00
joss17
79e02eb221 remove unused include 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1747 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:34:28 +00:00
joss17
b167fbe587 add missing letter 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1746 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:34:10 +00:00
joss17
333a9d31ee add missing slash 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1745 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:33:54 +00:00
joss17
4fe1bd8801 Remove miniupnp and add libupnp code 
Conflicts:

	libretroshare/src/libretroshare.pro

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1744 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-30 00:33:40 +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
173ae69b9f solve configuration bug 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-28 18:08:17 +00:00
joss17
8db756eda3 removed useless log 
;

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1741 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:50:55 +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
c1df0e1c1d remove debug defines 
Conflicts:

	libretroshare/src/libretroshare.pro

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1739 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:48:46 +00:00
joss17
6f7b21944c fix the length of the encrypting ssl passphrase 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1738 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:48:31 +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
joss17
af3e43ce4e code cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1732 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:46:17 +00:00
joss17
96fd660065 code cleaning 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1731 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:45:58 +00:00
joss17
a6029d69db change ssl password encryption to non symmetric 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1730 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-10-27 20:39:47 +00:00