aboutsummaryrefslogtreecommitdiff
path: root/src/or/buffers.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-01-06 05:42:31 +0000
committerNick Mathewson <nickm@torproject.org>2007-01-06 05:42:31 +0000
commitc8466c5919c68b43e2ec714b5bb57c70be330e54 (patch)
tree315deac802bef93b919edbd555c842102f71c496 /src/or/buffers.c
parent6b126ea040150661cd1419f0511e0c951d9b458e (diff)
downloadtor-c8466c5919c68b43e2ec714b5bb57c70be330e54.tar
tor-c8466c5919c68b43e2ec714b5bb57c70be330e54.tar.gz
r11824@Kushana: nickm | 2007-01-03 17:15:28 -0500
control-spec: upcase arguments in status events; note unimplemented events individually r11825@Kushana: nickm | 2007-01-03 17:41:43 -0500 Implement EXTERNAL IP server status event. r11826@Kushana: nickm | 2007-01-03 17:47:10 -0500 Implement BAD_SERVER_DESCRIPTOR server status event. r11827@Kushana: nickm | 2007-01-03 18:01:56 -0500 Implement SOCKS_UNKNOWN_PROTOCOL and DANGEROUS_SOCKS client events. r11828@Kushana: nickm | 2007-01-03 18:23:22 -0500 Implement BUG controller events. Also, flush ERR-level status events just like ERR-level log messages. r11829@Kushana: nickm | 2007-01-03 23:37:27 -0500 Yet more status events: CLOCK_SKEW, GOOD/ACCEPTED_SERVER_DESCRIPTOR, {CHECKING_}REACHABILITY_{SUCCEEDED|FAILED} r11833@Kushana: nickm | 2007-01-05 16:56:37 -0500 Note some unimplementedness in control-spec.txt svn:r9279
Diffstat (limited to 'src/or/buffers.c')
-rw-r--r--src/or/buffers.c13
1 files changed, 13 insertions, 0 deletions
diff --git a/src/or/buffers.c b/src/or/buffers.c
index eca91ae3b..9da86e8cd 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1022,6 +1022,9 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
"TorFAQ#SOCKSAndDNS.%s", req->port,
safe_socks ? " Rejecting." : "");
// have_warned_about_unsafe_socks = 1; // (for now, warn every time)
+ control_event_client_status(LOG_WARN,
+ "DANGEROUS_SOCKS PROTOCOL=SOCKS5 ADDRESS=%s:%d",
+ req->address, req->port);
if (safe_socks)
return -1;
}
@@ -1125,6 +1128,9 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
"TorFAQ#SOCKSAndDNS.%s", req->port,
safe_socks ? " Rejecting." : "");
// have_warned_about_unsafe_socks = 1; // (for now, warn every time)
+ control_event_client_status(LOG_WARN,
+ "DANGEROUS_SOCKS PROTOCOL=SOCKS4 ADDRESS=%s:%d",
+ tmpbuf, req->port);
if (safe_socks)
return -1;
}
@@ -1200,6 +1206,13 @@ fetch_from_buf_socks(buf_t *buf, socks_request_t *req,
log_warn(LD_APP,
"Socks version %d not recognized. (Tor is not an http proxy.)",
*(buf->cur));
+ {
+ char *tmp = tor_strndup(buf->cur, 8);
+ control_event_client_status(LOG_WARN,
+ "SOCKS_UNKNOWN_PROTOCOL DATA=\"%s\"",
+ escaped(tmp));
+ tor_free(tmp);
+ }
return -1;
}
}