From: Roger Dingledine Date: Wed, 4 Aug 2004 01:08:10 +0000 (+0000) Subject: put the have_warned_about_unsafe_socks static var inside the function X-Git-Tag: tor-0.0.8pre2~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8b55f73bbee6b282a451e87820cd8f38f13046ac;p=thirdparty%2Ftor.git put the have_warned_about_unsafe_socks static var inside the function svn:r2128 --- diff --git a/src/or/buffers.c b/src/or/buffers.c index 222140e47a..1d4ea50427 100644 --- a/src/or/buffers.c +++ b/src/or/buffers.c @@ -409,10 +409,6 @@ int fetch_from_buf_http(buf_t *buf, return 1; } -/** If the user connects with socks4 or the wrong variant of socks5, - * then log one warning to let him know that it might be unwise. */ -static int have_warned_about_unsafe_socks = 0; - /** There is a (possibly incomplete) socks handshake on buf, of one * of the forms * - socks4: "socksheader username\\0" @@ -440,6 +436,10 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) { char *next, *startaddr; struct in_addr in; + /* If the user connects with socks4 or the wrong variant of socks5, + * then log a warning to let him know that it might be unwise. */ + static int have_warned_about_unsafe_socks = 0; + if(buf->datalen < 2) /* version and another byte */ return 0; switch(*(buf->mem)) { /* which version of socks? */