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

warning suppression, removed unused p3portservice from compilation

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@2408 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2010-02-23 22:17:06 +00:00
parent ede337b7d4
commit 3d11b15490
7 changed files with 15 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libretroshare/src/ft/ftdbase.cc
View file

@ -216,8 +216,6 @@ bool ftFiMonitor::loadList(std::list<RsItem *> load)
std::cerr << std::endl; std::cerr << std::endl;
#endif #endif
time_t ts = time(NULL);
std::list<SharedDirInfo> dirList; std::list<SharedDirInfo> dirList;
std::list<RsItem *>::iterator it; std::list<RsItem *>::iterator it;

2
libretroshare/src/ft/ftfilecreator.cc
View file

@ -236,7 +236,7 @@ int ftFileCreator::initializeFileAttrs()
return 0; return 0;
} }
uint64_t recvdsize = ftello64(fd); //uint64_t recvdsize = ftello64(fd);
#ifdef FILE_DEBUG #ifdef FILE_DEBUG
std::cerr << "ftFileCreator::initializeFileAttrs() File Expected Size: " << mSize << " RecvdSize: " << recvdsize << std::endl; std::cerr << "ftFileCreator::initializeFileAttrs() File Expected Size: " << mSize << " RecvdSize: " << recvdsize << std::endl;

8
libretroshare/src/libretroshare.pro
View file

@ -11,12 +11,10 @@ profiling {
debug { debug {
# DEFINES *= DEBUG # DEFINES *= DEBUG
# DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG # DEFINES *= OPENDHT_DEBUG DHT_DEBUG CONN_DEBUG DEBUG_UDP_SORTER P3DISC_DEBUG DEBUG_UDP_LAYER FT_DEBUG EXTADDRSEARCH_DEBUG
# DEFINES *= CHAT_DEBUG CONTROL_DEBUG FT_DEBUG # DEFINES *= CONTROL_DEBUG FT_DEBUG DEBUG_FTCHUNK P3TURTLE_DEBUG
# DEFINES *= P3TURTLE_DEBUG UPNP_DEBUG # DEFINES *= P3TURTLE_DEBUG
# DEFINES *= CONN_DEBUG P3DISC_DEBUG RSSERIAL_DEBUG RSITEM_DEBUG DEBUG_PQISSL DEBUG_PQISTREAMER
# DEFINES *= NET_DEBUG # DEFINES *= NET_DEBUG
# DEFINES *= DISTRIB_DEBUG # DEFINES *= DISTRIB_DEBUG
# DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG # DEFINES *= P3TURTLE_DEBUG FT_DEBUG DEBUG_FTCHUNK MPLEX_DEBUG
# DEFINES *= CONN_DEBUG # DEFINES *= CONN_DEBUG
@ -273,7 +271,6 @@ HEADERS += dbase/cachestrapper.h \
services/p3gameservice.h \ services/p3gameservice.h \
services/p3msgservice.h \ services/p3msgservice.h \
services/p3photoservice.h \ services/p3photoservice.h \
services/p3portservice.h \
services/p3Qblog.h \ services/p3Qblog.h \
services/p3blogs.h \ services/p3blogs.h \
services/p3ranking.h \ services/p3ranking.h \
@ -332,7 +329,6 @@ SOURCES += \
dht/opendht.cc \ dht/opendht.cc \
dht/opendhtstr.cc \ dht/opendhtstr.cc \
dht/b64.cc \ dht/b64.cc \
services/p3portservice.cc \
services/p3channels.cc \ services/p3channels.cc \
services/p3forums.cc \ services/p3forums.cc \
services/p3blogs.cc \ services/p3blogs.cc \

1
libretroshare/src/rsserver/p3peers.cc
View file

@ -54,7 +54,6 @@ RsPeers *rsPeers = NULL;
* #define P3PEERS_DEBUG 1 * #define P3PEERS_DEBUG 1
*******/ *******/
static uint32_t RsPeerTranslateTrust(uint32_t trustLvl);
int ensureExtension(std::string &name, std::string def_ext); int ensureExtension(std::string &name, std::string def_ext);
std::string RsPeerTrustString(uint32_t trustLvl) std::string RsPeerTrustString(uint32_t trustLvl)

8
libretroshare/src/rsserver/rsinit.cc
View file

@ -1142,7 +1142,12 @@ int RsInit::LoadCertificates(bool autoLoginNT)
gpgme_data_t cipher; gpgme_data_t cipher;
gpgme_data_t plain; gpgme_data_t plain;
gpgme_data_new (&plain); gpgme_data_new (&plain);
gpgme_error_t error_reading_file = gpgme_data_new_from_stream (&cipher, sslPassphraseFile);
if( gpgme_data_new_from_stream (&cipher, sslPassphraseFile) != GPG_ERR_NO_ERROR)
{
std::cerr << "Error while creating stream from ssl passwd file." << std::endl ;
return 0 ;
}
if (0 < AuthGPG::getAuthGPG()->decryptText(cipher, plain)) { if (0 < AuthGPG::getAuthGPG()->decryptText(cipher, plain)) {
std::cerr << "Decrypting went ok !" << std::endl; std::cerr << "Decrypting went ok !" << std::endl;
gpgme_data_write (plain, "", 1); gpgme_data_write (plain, "", 1);
@ -1791,7 +1796,6 @@ int RsServer::StartupRetroShare()
emergencyPartialsDir += "Partials"; emergencyPartialsDir += "Partials";
/* if we've loaded an old format file! */ /* if we've loaded an old format file! */
bool oldFormat = false;
std::map<std::string, std::string> oldConfigMap; std::map<std::string, std::string> oldConfigMap;
AuthSSL::getAuthSSL() -> setConfigDirectories(certConfigFile, certNeighDir); AuthSSL::getAuthSSL() -> setConfigDirectories(certConfigFile, certNeighDir);

8
libretroshare/src/services/p3portservice.cc
View file

@ -57,7 +57,7 @@ int p3PortService::tick()
/* check for data on sockets */ /* check for data on sockets */
int sockfd; //int sockfd;
RsRawItem *item; RsRawItem *item;
//while(0 < (len = recv(sockfd, ....))) ... etc. //while(0 < (len = recv(sockfd, ....))) ... etc.
@ -72,7 +72,7 @@ int p3PortService::tick()
/* input data TODO! */ /* input data TODO! */
void *data; void *data;
uint32_t len; uint32_t len=0;
uint32_t packetId = (((uint32_t) RS_PKT_VERSION_SERVICE) << 24) + uint32_t packetId = (((uint32_t) RS_PKT_VERSION_SERVICE) << 24) +
(((uint32_t) RS_SERVICE_TYPE_PORT) << 8); (((uint32_t) RS_SERVICE_TYPE_PORT) << 8);
@ -97,8 +97,8 @@ int p3PortService::tick()
{ {
/* unpackage data */ /* unpackage data */
std::string src = item->PeerId(); std::string src = item->PeerId();
void *item_data = item->getRawData(); // void *item_data = item->getRawData();
uint32_t item_len = item->getRawLength(); // uint32_t item_len = item->getRawLength();
/* push out to the socket .... */ /* push out to the socket .... */
// send(sockfd, item_len, item_data....) // send(sockfd, item_len, item_data....)

3
libretroshare/src/upnp/UPnPBase.cpp
View file

@ -1025,7 +1025,8 @@ char* CUPnPControlPoint::getInternalIpAddress()
{ {
char * addr = UpnpGetServerIpAddress(); char * addr = UpnpGetServerIpAddress();
if (addr == NULL) { if (addr == NULL) {
addr = "127.0.0.1"; addr = new char[10] ;
sprintf(addr,"%s","127.0.0.1");
} }
return addr; return addr;
} }