Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

*** empty log message *** 

svn path=/trunk/boinc/; revision=1661
This commit is contained in:
Karl Chen 2003-07-10 21:50:54 +00:00
parent c9d88c816c
commit a98c68414d
1 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
client/net_xfer.C
View File

@ -2,18 +2,18 @@
// Version 1.0 (the "License"); you may not use this file except in // Version 1.0 (the "License"); you may not use this file except in
// compliance with the License. You may obtain a copy of the License at // compliance with the License. You may obtain a copy of the License at
// http://boinc.berkeley.edu/license_1.0.txt // http://boinc.berkeley.edu/license_1.0.txt
// //
// Software distributed under the License is distributed on an "AS IS" // Software distributed under the License is distributed on an "AS IS"
// basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the // basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
// License for the specific language governing rights and limitations // License for the specific language governing rights and limitations
// under the License. // under the License.
// //
// The Original Code is the Berkeley Open Infrastructure for Network Computing. // The Original Code is the Berkeley Open Infrastructure for Network Computing.
// //
// The Initial Developer of the Original Code is the SETI@home project. // The Initial Developer of the Original Code is the SETI@home project.
// Portions created by the SETI@home project are Copyright (C) 2002 // Portions created by the SETI@home project are Copyright (C) 2002
// University of California at Berkeley. All Rights Reserved. // University of California at Berkeley. All Rights Reserved.
// //
// Contributor(s): // Contributor(s):
// //
@ -67,9 +67,8 @@
#include "client_state.h" #include "client_state.h"
#include "message.h" #include "message.h"
// If socklen_t isn't defined, define it here as size_t #if !GETSOCKOPT_SOCKLEN_T
#if !defined(socklen_t) typedef size_t socklen_t;
#define socklen_t size_t
#endif #endif
int NET_XFER::get_ip_addr( char *hostname, int &ip_addr ) { int NET_XFER::get_ip_addr( char *hostname, int &ip_addr ) {
@ -324,13 +323,7 @@ int NET_XFER_SET::do_select(double& bytes_transferred, timeval& timeout) {
int n, fd, retval; int n, fd, retval;
socklen_t i; socklen_t i;
NET_XFER *nxp; NET_XFER *nxp;
#if GETSOCKOPT_SIZE_T
size_t intsize = sizeof(int);
#elif GETSOCKOPT_SOCKLEN_T
socklen_t intsize = sizeof(int); socklen_t intsize = sizeof(int);
#else
socklen_t intsize = sizeof(int);
#endif
ScopeMessages scope_messages(log_messages, ClientMessages::DEBUG_NET_XFER); ScopeMessages scope_messages(log_messages, ClientMessages::DEBUG_NET_XFER);
@ -390,13 +383,13 @@ int NET_XFER_SET::do_select(double& bytes_transferred, timeval& timeout) {
fd = nxp->socket; fd = nxp->socket;
if (FD_ISSET(fd, &read_fds) || FD_ISSET(fd, &write_fds)) { if (FD_ISSET(fd, &read_fds) || FD_ISSET(fd, &write_fds)) {
if (!nxp->is_connected) { if (!nxp->is_connected) {
#ifdef _WIN32 // #ifdef _WIN32
getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&n, (int *)&intsize); // getsockopt(fd, SOL_SOCKET, SO_ERROR, (char *)&n, (int *)&intsize);
#elif __APPLE__ // #elif __APPLE__
getsockopt(fd, SOL_SOCKET, SO_ERROR, &n, (int *)&intsize); // getsockopt(fd, SOL_SOCKET, SO_ERROR, &n, (int *)&intsize);
#else // #else
getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&n, &intsize); getsockopt(fd, SOL_SOCKET, SO_ERROR, (void*)&n, &intsize);
#endif // #endif
if (n) { if (n) {
scope_messages.printf("NET_XFER_SET::do_select(): socket %d connect failed\n", fd); scope_messages.printf("NET_XFER_SET::do_select(): socket %d connect failed\n", fd);
nxp->error = ERR_CONNECT; nxp->error = ERR_CONNECT;