Commit Graph

72 Commits

Author SHA1 Message Date
thunder2
a304ffbab7 Fixed some compiler warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6419 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2013-06-09 17:54:54 +00:00
drbob
069b72e0b2 Merged branch v0.5-gxs-b1 into trunk (from -r 5351 -> 5995)
This brings a huge amount of goodness into the trunk,
but there is still a big chunk todo before it can be released.

 * GXS Backend.
 * GXS Services:
	- Identities.
	- Circles
	- Photos
	- Wiki
	- GxsForums
	- Posted.
 * SSH no-gui server.

See branch commits for more info.

To switch on GXS stuff, enable CONFIG += gxs
in both libretroshare.pro and retroshare-gui.pro



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5996 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-12-16 19:17:11 +00:00
csoler
7fa9dbb2b1 patch from AC to solve compilation w.r.t. patched libupnp whatever the version number. Should work on debian as well.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5819 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-14 20:24:07 +00:00
thunder2
9581e83c01 Fixed compile under Kubuntu 12.10.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5814 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-11-13 11:58:56 +00:00
chrisparker126
da70036f0f fixed window minupnpc source, header file incorrect
got Topic creation working with Posted GUI/backend
refactored Posted/PostedGroupDialog to posted folder


git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5742 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-29 22:41:41 +00:00
drbob
a5f52e85a1 Added new Upnp interface fn, and dummy implementations.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5734 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-28 18:17:06 +00:00
drbob
d208b59d33 Split the upnp files into libupnp and miniupnp implementations.
modified libretroshare.pro to allow either to be used.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-gxs-b1@5733 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-10-28 16:51:00 +00:00
csoler
e34ca140ba debian compatibility fixing for patched-up upnp 1.6.17
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5442 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-19 19:32:05 +00:00
drbob
20d7837806 Modified UPNP_VERSION comparison from 10617 to 10800, as it appears the functionality was only added then.
I'm sure I'll be told if this wrong - as I can't test this ;)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5440 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-18 19:34:14 +00:00
csoler
5b73e36add fixed compilation with libupnp >= 1.6.17
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5427 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-08-15 15:33:30 +00:00
thunder2
a6dfac2a37 Removed std::stringstream.
Removed not necessary include <sstream>.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5112 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-19 22:10:00 +00:00
thunder2
b71eeadf95 Removed some std::ostringstream.
To be continued.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5109 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-04-18 21:20:37 +00:00
thunder2
970d88200d Removed some more compiler warnings from Windows compile (GCC 4.4).
Added -Wextra to the Windows compile.
Added new define in libbitdht for snprintf and fprintf to proper handling of "%ll" under Windows.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4951 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2012-02-17 10:03:38 +00:00
thunder2
c6beee44ec Removed unused parameter warnings in libretroshare.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4558 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-08-12 13:42:30 +00:00
thunder2
71f632b99f Fixed compile on Linux.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-08 09:54:27 +00:00
thunder2
de87a89437 Added a name to the RsMutex class.
You can enable the debugging of the waiting time for a lock of RsMutex in rsthreads.h with
#define RSMUTEX_DEBUG 300
That means all locks waiting longer than 300ms are logged into the stderr.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4392 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-07-04 22:59:39 +00:00
csoler
eae57516c5 Included patch to compile on OpenSUSE 11.4 (from AsamK)
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4218 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2011-05-24 10:25:43 +00:00
drbob
ae4ee9df00 Networking REWORK: Changes for other bits
* Fixed #includes in upnp
 * switched p3disc over to the new data types.
 * added new source to .pro file
 * minor changes to other code.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3249 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-07-04 10:42:17 +00:00
thunder2
c3b6da6386 cleaned some compiler warnings
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3092 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-06-09 19:51:46 +00:00
csoler
0d533d14b1 suppressed uninitialized memory read
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2765 b45a01b8-16f6-495d-af2f-9b41ad6348cc
2010-04-23 13:13:36 +00:00
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