c->name, c->hostname);
} else if(errno == EINTR) {
continue;
-#ifdef EWOULDBLOCK
- } else if(errno == EWOULDBLOCK) {
+ } else if(sockwouldblock(sockerrno)) {
ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Flushing %d bytes to %s (%s) would block",
c->outbuflen, c->name, c->hostname);
return true;
-#endif
} else {
logger(LOG_ERR, "Flushing meta data to %s (%s) failed: %s", c->name,
- c->hostname, strerror(errno));
+ c->hostname, sockstrerror(sockerrno));
}
return false;
if(!lenin || !errno) {
ifdebug(CONNECTIONS) logger(LOG_NOTICE, "Connection closed by %s (%s)",
c->name, c->hostname);
- } else if(errno == EINTR)
+ } else if(sockwouldblock(sockerrno))
return true;
else
logger(LOG_ERR, "Metadata socket read error for %s (%s): %s",
- c->name, c->hostname, strerror(errno));
+ c->name, c->hostname, sockstrerror(sockerrno));
return false;
}
if(c->tcplen) {
if(c->tcplen <= c->buflen) {
- receive_tcppacket(c, c->buffer, c->tcplen);
+ if(proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+ if(c->buffer[0] == 0 && c->buffer[1] == 0x5a) {
+ logger(LOG_DEBUG, "Proxy request granted");
+ } else {
+ logger(LOG_ERR, "Proxy request rejected");
+ return false;
+ }
+ } else
+ receive_tcppacket(c, c->buffer, c->tcplen);
c->buflen -= c->tcplen;
lenin -= c->tcplen - oldlen;