Fix compiler warnings on some BSD variants.

[meshlink] / src / meta.c

diff --git a/src/meta.c b/src/meta.c
index 28c85cf0e6b9615866771857e8a201b6fccadb8b..fafba653c4d014f237585d7b704e4e56f642121c 100644 (file)
--- a/src/meta.c
+++ b/src/meta.c
@@ -189,19 +189,19 @@ bool receive_meta(connection_t *c) {
                                        break;
 
                                if(!c->node) {
-                                       if(proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
+                                       if(c->outgoing && proxytype == PROXY_SOCKS4 && c->allow_request == ID) {
                                                if(tcpbuffer[0] == 0 && tcpbuffer[1] == 0x5a) {
                                                        logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Proxy request granted");
                                                } else {
                                                        logger(DEBUG_CONNECTIONS, 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(tcpbuffer[0] != 5) {
                                                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Invalid response from proxy server");
                                                        return false;
                                                }
-                                               if(tcpbuffer[1] == 0xff) {
+                                               if(tcpbuffer[1] == (char)0xff) {
                                                        logger(DEBUG_CONNECTIONS, LOG_ERR, "Proxy request rejected: unsuitable authentication method");
                                                        return false;
                                                }