Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-17 03:44:31 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,557 Commits 63 Branches 22 Tags 195 MiB
22bf9b11b1
Commit Graph

37 Commits

Author SHA1 Message Date
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
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
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
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
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
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
36a534b85d add includes for linux 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1692 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-09-26 19:17:32 +00:00
defnax
6d178d00cf added forgotten Path Defines UPNPC_DIR , GPG_ERROR_DIR, GPGME_DIR for linux-g++ section 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1691 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-09-26 18:09:34 +00:00
csoler
57ba727b6a fixed win32-x-g++ compilation 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1595 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-09-05 11:59:42 +00:00
defnax
4ea523306b changend OpenSSL dir name for Windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1594 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-09-05 02:12:30 +00:00
defnax
0930dbf8f2 set new miniupnpc version 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1496 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-08-05 18:27:05 +00:00
defnax
5d2da3f6c8 moved version_detail_bash_script to only linux section doesnt works with windows. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1479 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-08-02 17:49:11 +00:00
joss17
96f2d92ee7 rewrite script to include them in the make file. Use both util/rsversion.h and gui/help/version.html for gui version information 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1473 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-08-01 13:53:47 +00:00
defnax
d024c7673a cleaned little bit libretroshare.pro , removed not needed xpgp sections 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1456 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-07-31 15:03:43 +00:00
drbob
a023a0bfcd Major change to the way certificates are stored now defaults to ~/.retroshare/SSLID/ 
* supports Multiple Accounts on same computer.
	* Enabled libretroshare tests using Makefiles.
	* restructured RsInit functions: Config Data is now private.
	* switch OpenPGP on by default (added #define to rsinit).
	


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1451 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-07-30 21:27:47 +00:00
alexandrut
c7ecf8c46d add implementation for priority download queue 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1432 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-07-26 15:00:29 +00:00
defnax
f24e2dda02 added includepath for gpgme and gpg-error 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1417 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-07-24 15:34:24 +00:00
csoler
49e9066afb updated libretroshare.pro so that people can choose between pgp and xpgp by doing "qmake CONFIG=pgp" or "qmake CONFIG=xpgp", or directly update the CONFIG variable in the .pro to change the default behavior. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1358 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-07-12 12:53:49 +00:00
ammorais
2eccbce332 Updated the RetroShare.pro, fixed problem in p3face-startup, and upnputil.c with UPNP_AddPortMapping number of parameters when compiled with miniupnpc-1.0 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-07-08 14:49:20 +00:00
alexandrut
0b6800a5ce exchange of what version of retroshare our friends are using 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1308 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-06-28 20:57:02 +00:00
csoler
1046bdd846 First commit for the turtle download. It works without perturbating RS traffic, but still needs some (internal) smoothing 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1275 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-26 21:42:45 +00:00
defnax
c298de7f15 removed pqistrings header from libretroshare project file doesnt needed more 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1274 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-26 15:37:17 +00:00
csoler
d22e1ceb23 added entry for pqistore 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1205 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-05-09 10:25:44 +00:00
defnax
449674be3f fixed libretroshare.pro for win32 compile 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1121 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-09 17:04:32 +00:00
csoler
afb51d5d31 added missing file entry 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1112 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-04-04 16:42:52 +00:00
csoler
4ef56e1b79 suppressed #ifdef TURTLE_HOPPING from libretroshare, as it s not anymore needed. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1094 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-03-22 14:08:02 +00:00
defnax
7e37bde130 fixed path for SSL_DIR and UPNPC_DIR in libretroshare.pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1082 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-03-18 18:57:33 +00:00
csoler
8d08034380 added config target for turtle hoping, pushed router dev a little further. 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1074 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-03-12 20:08:02 +00:00
defnax
580123a232 added QMAKE_CC = g++ to win32 section in .pro file 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1052 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-02-24 21:42:59 +00:00
defnax
b9abc24e5c update win32 section 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1021 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-02-08 13:31:21 +00:00
defnax
8c6c7f3840 added win32 but not complete for compile under windows 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1001 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-02-04 15:37:37 +00:00
csoler
de3d6fb366 added linux-g++-64 target to libretroshare.pro 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@974 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-02-02 12:29:40 +00:00
csoler
bc5b8ef702 Added a .pro file for libretroshare. This does not compile retroshare-nogui though, so I keep the Makefile in the svn 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@966 b45a01b8-16f6-495d-af2f-9b41ad6348cc
 2009-02-01 14:06:21 +00:00