TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 00:32:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

*** empty log message ***

Browse Source
This commit is contained in:
Mike Goslin 2000-11-02 20:32:41 +00:00
parent 6bfbb4edf7
commit 0bd04fc0dc
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
panda/src/downloader/downloader.cxx
View File

@ -389,6 +389,7 @@ safe_send(int socket, const char *data, int length, long timeout) {
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
int Downloader:: int Downloader::
safe_receive(int socket, char *data, int length, long timeout) { safe_receive(int socket, char *data, int length, long timeout) {
char *data_ptr = data;
if (length == 0) { if (length == 0) {
downloader_cat.error() downloader_cat.error()
<< "Downloader::safe_receive() - requested 0 length receive!" << endl; << "Downloader::safe_receive() - requested 0 length receive!" << endl;
@ -413,12 +414,18 @@ safe_receive(int socket, char *data, int length, long timeout) {
<< "Downloader::safe_receive() - error: " << strerror(errno) << endl; << "Downloader::safe_receive() - error: " << strerror(errno) << endl;
return bytes; return bytes;
} }
int ret = recv(socket, data, length, 0); int ret = recv(socket, data_ptr, length - bytes, 0);
if (ret > 0) if (ret > 0) {
downloader_cat.debug()
<< "Downloader::safe_receive() - recv() got: " << ret << " bytes"
<< endl;
bytes += ret; bytes += ret;
else if (ret == 0) data_ptr += ret;
return 0; } else if (ret == 0) {
else { downloader_cat.debug()
<< "Downloader::safe_receive() - End of file" << endl;
return bytes;
} else {
downloader_cat.error() downloader_cat.error()
<< "Downloader::safe_receive() - error: " << strerror(errno) << endl; << "Downloader::safe_receive() - error: " << strerror(errno) << endl;
return bytes; return bytes;