interesting
/
getdns
mirror of https://github.com/getdnsapi/getdns.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Few more renames

This commit is contained in:
Willem Toorop 2017-11-03 16:26:19 +01:00
parent 3b7b83e309
commit 4508ec77fb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/extension/select_eventloop.c
View File

@ -245,7 +245,7 @@ select_eventloop_run_once(getdns_eventloop *loop, int blocking)
#endif #endif
if (select(max_fd + 1, &readfds, &writefds, NULL, if (select(max_fd + 1, &readfds, &writefds, NULL,
(timeout == TIMEOUT_FOREVER ? NULL : &tv)) < 0) { (timeout == TIMEOUT_FOREVER ? NULL : &tv)) < 0) {
if (_getdns_socket_retr()) if (_getdns_socket_wants_retry())
return; return;
DEBUG_SCHED("I/O error with select(): %s\n", _getdns_errnostr()); DEBUG_SCHED("I/O error with select(): %s\n", _getdns_errnostr());

12
src/platform.h
View File

@ -137,12 +137,12 @@ const char *_getdns_strerror(int errnum);
void _getdns_perror(const char *str); void _getdns_perror(const char *str);
#define _getdns_errnostr() (_getdns_strerror(_getdns_socketerror())) #define _getdns_errnostr() (_getdns_strerror(_getdns_socketerror()))
#define _getdns_errno_retry(X) ( (X) == _getdns_EINTR \ #define _getdns_error_wants_retry(X) ( (X) == _getdns_EINTR \
|| (X) == _getdns_EAGAIN \ || (X) == _getdns_EAGAIN \
|| (X) == _getdns_EWOULDBLOCK \ || (X) == _getdns_EWOULDBLOCK \
|| (X) == _getdns_EINPROGRESS \ || (X) == _getdns_EINPROGRESS \
|| (X) == _getdns_ENOBUFS ) || (X) == _getdns_ENOBUFS )
#define _getdns_socket_wants_retry() (_getdns_errno_retry(_getdns_socketerror())) #define _getdns_socket_wants_retry() (_getdns_error_wants_retry(_getdns_socketerror()))
#define _getdns_resource_depletion() ( _getdns_socketerror() == _getdns_ENFILE \ #define _getdns_resource_depletion() ( _getdns_socketerror() == _getdns_ENFILE \
|| _getdns_socketerror() == _getdns_EMFILE ) || _getdns_socketerror() == _getdns_EMFILE )

2
src/stub.c
View File

@ -430,7 +430,7 @@ tcp_connected(getdns_upstream *upstream) {
int error = 0; int error = 0;
socklen_t len = (socklen_t)sizeof(error); socklen_t len = (socklen_t)sizeof(error);
getsockopt(upstream->fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len); getsockopt(upstream->fd, SOL_SOCKET, SO_ERROR, (void*)&error, &len);
if (_getdns_errno_retry(error)) if (_getdns_error_wants_retry(error))
return STUB_TCP_RETRY; return STUB_TCP_RETRY;
else if (error != 0) { else if (error != 0) {
return STUB_SETUP_ERROR; return STUB_SETUP_ERROR;