Commit Graph

52 Commits

Author SHA1 Message Date
joss17
936f0f88cb put UPNPBase under LGPL
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2525 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-03-12 23:09:17 +00:00
csoler
3d11b15490 warning suppression, removed unused p3portservice from compilation
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-23 22:17:06 +00:00
drbob
56e9536336 Modified libretroshare to compile under MacOSX.
1) b64.c used c++ functions -> b64.cc
2) OSX will use miniupnpc for now -> modified #defines.
3) change in openssl fn signature?
4) updated build file for OSX.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2344 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-16 22:25:58 +00:00
joss17
b46cf457db further log cleanings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2271 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-10 10:56:54 +00:00
csoler
365ef569dc suppressed some uninitialised memory reads
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2267 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-09 20:31:49 +00:00
joss17
6f1e4623ab further log cleanings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2239 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-02-08 14:06:43 +00:00
joss17
15e3a0d075 fix a null pointer bug update
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2165 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-31 19:45:35 +00:00
joss17
906cc25379 fix a null pointer bug
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2164 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-31 19:45:08 +00:00
csoler
b592bdac62 added return statements is functions that missed one
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2137 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-01-27 08:24:39 +00:00
joss17
225cee6627 fix a bug in upnp
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1899 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-12-18 17:49:49 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
csoler
f9dc3b223b Started implementing flags to handle the sharing mode.
What works:
- the gui shows the flags in ShareManager
- the flags are loaded/saved to ft_shared.cfg and passed on to FileIndexMonitor
What does not work yet:
- the flags are not accounted for yet by FileIndexMonitor

In addition:
- simplified the directories dialog in Preferences, so that it calls the ShareManager instead of dupplicating the directories management 
code that becomes larger.
- setup the ShareManager to be a singleton, so as to coherently call it from different places.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1486 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-08-03 19:43:52 +00:00
drbob
870a30eac5 Modifications for updated Windows Build.
1) mods to use miniupnpc v1.3
2) bugfix to use WriteFile instead of write under windows with gpgme.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1449 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2009-07-30 14:36:42 +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
stockpicker
c222c354d6 Changes to support both miniupnpc 1.0 and up-to-date 1.2
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@786 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-11-02 13:33:06 +00:00
drbob
33032e8a83 * Modified p3ConnectMgr to enable Standalone testing of components.
* Created pqiNetAssist interfaces for DHT and UPnP.
 * Created PQIHub etc for standalone testing (in ft/pqitestor.h for now).
 * Add basics of first server test ... its not quite complete yet.
 * Improvements to ftserver.
 * Changes to many tests to match other mods.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@689 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-08-16 15:02:24 +00:00
drbob
9c2558dbf0 Final changes as we head towards V0.4.09a release.
* Switched on RELEASE flag in libretroshare.
 * Added missing Mutex lock in upnphandler.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@598 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-13 23:22:20 +00:00
chrisparker126
d8bfc6d8b3 Mostly connectivity code additions
* implementation of p3config, cache functionality to p3Qblog
* added peerid (pid) attribute to rsQblog item and its serialisation
* TODO: logical updating for p3Qblog
* TODO: implement tick() so can add to server 
* TODO: test p3Qblog after addition of tick with some peers



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@571 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-06-04 10:59:24 +00:00
drbob
77342705ea BUGFIX: Mutex remained locked if Upnp setup failed.
This caused the freezing on many people PCs.  It happened if 
	(1) Networking was set to Automatic.
	(2) UPnP was not available.

But its fixed now!




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@513 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-22 11:45:28 +00:00
drbob
94371600be Fixed upnp issues
* Removed periodic Check and thread.
 * Added Shutdown.
 * switched to terminating background thread.
 * removed temporary lease.
 * A bit of a HACK - this class could be cleaned up significantly.

Adding the start of forums/channels.
 * Dummy Interface and Forum data (so GUI work can start)
 * rough p3distrib - needs a lot of work.

Added shutdown function to p3connmgr, to shutdown Upnp.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@493 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-04-09 12:54:15 +00:00
drbob
8d3f9a3ec6 Important changes to tighten up the connection methods:
* Switched to miniupnpc-1.0
 * modified miniupnpc to add lease duration.
 * set lease duration to 1 Hr.
 * Modified configure scripts to use miniupnpc-1.0

 * added TIMEOUT to all connections (5 sec for TCP - Important!)
 * reduced TCP offset delay to 2 seconds.
 * BUGFIX: Added missing connect_parameter wrapper function.
 * added reset to other connection methods when connection is made.
 * Added Connection Type (TCP/UDP) information to feedback/GUI

 * Increased default Data Rates: from 50/50 to 100/500 kB/s
 * Removed Default Bootstrap Ids. (only automatic now!)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@423 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-26 15:35:09 +00:00
drbob
048e84630e Changes to upnp interface to support miniupnpc-1.0
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@421 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-26 02:41:01 +00:00
drbob
9bdd44d0f5 Changes required to get Retroshare V0.4 working under windows.
Most of these changes relate to:
 (1) rand() is different 
 (2) sleep() don't exist on Windows.
 (3) networking headers are different - these need to be cleaned up in general.
 (4) disabled tests that won't compile on Windows.

Will probably have to rollback some of these changes for Unix later.





git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@372 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-03-03 14:41:15 +00:00
drbob
6dd3d30d8e Additions to tcponudp to add a TouKeepAlive system.
This is only used if we are in 'firewalled' mode.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@360 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-02-28 10:43:33 +00:00
drbob
31454138b7 Fixed up some Upnp issues:
* Enabled a lease duration (requires mods to miniupnpc library)
 * this is set at 10 mins for the moment.
 * Added Check functions to see if UPnP forwarding is still up.
 * improved error checking in Forward() function.
 * added #define for UDP local address testing.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@359 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-02-27 15:43:02 +00:00
drbob
98a14ba715 Tweaks to get the UPnP working. Corrected network address passing,
and also adjusted DHT timeout periods.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@345 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-02-11 16:27:55 +00:00
drbob
3451af6152 Changes to libretroshare to make the system compile on Mac OSX 10.3
* minor changes to networking headers.
* addition of several virtual destructors (remove warnings)
* switched Makefiles to new system.
* added macosx specific configuration file.
* removed KadC compilation checks.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@324 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2008-02-03 06:17:33 +00:00