put the have_warned_about_unsafe_socks static var inside the function

svn:r2128
This commit is contained in:
Roger Dingledine 2004-08-04 01:08:10 +00:00
parent 5b61dd0457
commit 8b55f73bbe

View File

@ -409,10 +409,6 @@ int fetch_from_buf_http(buf_t *buf,
return 1; 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 <b>buf</b>, of one /** There is a (possibly incomplete) socks handshake on <b>buf</b>, of one
* of the forms * of the forms
* - socks4: "socksheader username\\0" * - socks4: "socksheader username\\0"
@ -440,6 +436,10 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req) {
char *next, *startaddr; char *next, *startaddr;
struct in_addr in; 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 */ if(buf->datalen < 2) /* version and another byte */
return 0; return 0;
switch(*(buf->mem)) { /* which version of socks? */ switch(*(buf->mem)) { /* which version of socks? */