* HACK: fixed mem issues with file data - not ideal

* removed more debug: filedata prints.
 * removed rank/photo/games from setup for release (#define RS_RELEASE)



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@464 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-04-03 14:34:52 +00:00
parent 0a68ec6bee
commit 6c90e1ad67
5 changed files with 49 additions and 14 deletions

View file

@ -496,14 +496,17 @@ int filedexserver::handleInputQueues()
i_init = i;
while((fr = pqisi -> GetFileRequest()) != NULL )
{
//std::cerr << "filedexserver::handleInputQueues() Recvd ftFiler Request" << std::endl;
#ifdef SERVER_DEBUG
std::cerr << "filedexserver::handleInputQueues() Recvd ftFiler Request" << std::endl;
std::ostringstream out;
if (i++ == i_init)
if (i == i_init)
{
out << "Incoming(Net) File Item:" << std::endl;
}
fr -> print(out);
pqioutput(PQL_DEBUG_BASIC, fldxsrvrzone, out.str());
#endif
i++; /* count */
/* This bit is for debugging only! (not really needed) */
@ -521,20 +524,23 @@ int filedexserver::handleInputQueues()
while((fd = pqisi -> GetFileData()) != NULL )
{
//std::cerr << "filedexserver::handleInputQueues() Recvd ftFiler Data" << std::endl;
#ifdef SERVER_DEBUG
std::ostringstream out;
if (i++ == i_init)
if (i == i_init)
{
out << "Incoming(Net) File Data:" << std::endl;
}
fd -> print(out);
pqioutput(PQL_DEBUG_BASIC, fldxsrvrzone, out.str());
#endif
i++; /* count */
/* incoming data */
ftFileData *ffd = new ftFileData(fd->PeerId(),
fd->fd.file.hash, fd->fd.file.filesize,
fd->fd.file_offset,
fd->fd.binData.bin_len,
fd->fd.binData.bin_data);
fd->fd.binData.bin_data, FT_FILEDATA_FLAG_NOFREE);
ftFiler->recvFileInfo(ffd);
delete fd;