Sfoglia il codice sorgente

*** empty log message ***

Mike Goslin 25 anni fa
parent
commit
78d368b6ca
1 ha cambiato i file con 5 aggiunte e 3 eliminazioni
  1. 5 3
      panda/src/downloader/downloader.cxx

+ 5 - 3
panda/src/downloader/downloader.cxx

@@ -237,12 +237,13 @@ fast_receive(int socket, DownloadStatus *status, int rec_size) {
   fd_set rset;
   fd_set rset;
   FD_ZERO(&rset);
   FD_ZERO(&rset);
   FD_SET(socket, &rset);
   FD_SET(socket, &rset);
-  int sret = select(socket + 1, &rset, NULL, NULL, &tv);
+  int sret = select(socket, &rset, NULL, NULL, &tv);
   if (sret == 0) {
   if (sret == 0) {
     return FR_no_data;
     return FR_no_data;
   } else if (sret == -1) {
   } else if (sret == -1) {
     downloader_cat.error()
     downloader_cat.error()
-      << "Downloader::safe_receive() - error: " << strerror(errno) << endl;
+      << "Downloader::fast_receive() - select() error: " 
+      << strerror(errno) << endl;
     return FR_error;
     return FR_error;
   }
   }
   int ret = recv(socket, status->_next_in, rec_size, 0);
   int ret = recv(socket, status->_next_in, rec_size, 0);
@@ -250,7 +251,8 @@ fast_receive(int socket, DownloadStatus *status, int rec_size) {
     return FR_eof;
     return FR_eof;
   } else if (ret == -1) {
   } else if (ret == -1) {
     downloader_cat.error()
     downloader_cat.error()
-      << "Downloader::fast_receive() - error: " << strerror(errno) << endl;
+      << "Downloader::fast_receive() - recv() error: " 
+      << strerror(errno) << endl;
     return FR_error;
     return FR_error;
   }
   }
   if (downloader_cat.is_debug())
   if (downloader_cat.is_debug())