/*
meta.c -- handle the meta communication
- Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
+ Copyright (C) 2000-2014 Guus Sliepen <guus@tinc-vpn.org>,
2000-2005 Ivo Timmermans
2006 Scott Lamb <slamb@slamb.org>
if(c->tcplen) {
if(c->tcplen <= c->buflen) {
if(!c->node) {
- if(proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+ if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
if(c->buffer[0] == 0 && c->buffer[1] == 0x5a) {
- logger(LOG_DEBUG, "Proxy request granted");
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted");
} else {
logger(LOG_ERR, "Proxy request rejected");
return false;
}
- } else if(proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
+ } else if(c->outgoing && proxytype == PROXY_SOCKS5 && c->allow_request == ID) {
if(c->buffer[0] != 5) {
logger(LOG_ERR, "Invalid response from proxy server");
return false;
}
- if(c->buffer[1] == 0xff) {
+ if(c->buffer[1] == (char)0xff) {
logger(LOG_ERR, "Proxy request rejected: unsuitable authentication method");
return false;
}
return false;
}
if(c->buffer[3] == 0) {
- logger(LOG_DEBUG, "Proxy request granted");
+ ifdebug(CONNECTIONS) logger(LOG_DEBUG, "Proxy request granted");
} else {
- logger(LOG_DEBUG, "Proxy request rejected");
+ logger(LOG_ERR, "Proxy request rejected");
return false;
}
} else {