Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-13 17:13:06 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated the RetroShare.pro, fixed problem in p3face-startup, and upnputil.c with UPNP_AddPortMapping number of parameters when compiled with miniupnpc-1.0

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1332 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
ammorais 2009-07-08 14:49:20 +00:00
parent fec470c774
commit 2eccbce332
4 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/libretroshare.pro
View file

@ -116,7 +116,6 @@ HEADERS += dbase/cachestrapper.h \
pqi/authssl.h \ pqi/authssl.h \
pqi/authxpgp.h \ pqi/authxpgp.h \
pqi/cleanupxpgp.h \ pqi/cleanupxpgp.h \
pqi/gpgauthmgr.h \
pqi/p3authmgr.h \ pqi/p3authmgr.h \
pqi/p3cfgmgr.h \ pqi/p3cfgmgr.h \
pqi/p3connmgr.h \ pqi/p3connmgr.h \

2
libretroshare/src/rsserver/p3face-startup.cc
View file

@ -1172,7 +1172,7 @@ bool RsInit::RsGenerateCertificate(
/**************** PQI_USE_XPGP ******************/ /**************** PQI_USE_XPGP ******************/
#if defined(PQI_USE_XPGP) #if defined(PQI_USE_XPGP)
if (!generate_xpgp(cert_name.c_str(), key_name.c_str(), if (generate_xpgp(cert_name.c_str(), key_name.c_str(),
password.c_str(), password.c_str(),
name.c_str(), name.c_str(),
"", //ui -> gen_email -> value(), "", //ui -> gen_email -> value(),

3
libretroshare/src/upnp/upnputil.c
View file

@ -146,8 +146,9 @@ bool SetRedirectAndTest(struct UPNPUrls * urls,
r = UPNP_AddPortMapping(urls->controlURL, data->servicetype, r = UPNP_AddPortMapping(urls->controlURL, data->servicetype,
eport, iport, iaddr, 0, proto); eport, iport, iaddr, 0, proto);
#else #else
/* The lease parameter is also gone in minupnpc 1.0 */
r = UPNP_AddPortMapping(urls->controlURL, data->servicetype, r = UPNP_AddPortMapping(urls->controlURL, data->servicetype,
eport, iport, iaddr, 0, 0, proto); eport, iport, iaddr, 0, proto);
#endif #endif
// r = UPNP_AddPortMapping(urls->controlURL, data->servicetype, // r = UPNP_AddPortMapping(urls->controlURL, data->servicetype,

12
retroshare-gui/src/RetroShare.pro
View file

@ -64,7 +64,17 @@ macx {
############################## Common stuff ###################################### ############################## Common stuff ######################################
LIBS += -lretroshare -lminiupnpc -lssl -lcrypto # On Linux systems that alredy have libssl and libcrypto it is advisable
# to rename the patched version of SSL to something like libsslxpgp.a and libcryptoxpg.a
# comment the next option if you renamed libcrtypto and libssl
LIBS += -L"../../../../lib" -lretroshare -lminiupnpc -lssl -lcrypto
# uncomment the next option if you renamed libcrtypto and libssl
#LIBS += -L"../../../../lib" -lretroshare -lminiupnpc -lsslxpgp -lcryptoxpgp
# ###########################################
LIBS += -lz -lgpgme LIBS += -lz -lgpgme
LIBS += -lQtUiTools LIBS += -lQtUiTools