nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

answer nick's XXX, and muck with some log domain choices

Browse Source 
svn:r5339
This commit is contained in:
Roger Dingledine 2005-11-01 06:13:12 +00:00
parent c68cadc0c8
commit 40ecaf4857
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/cpuworker.c
View File

@ -163,13 +163,17 @@ connection_cpu_process_inbuf(connection_t *conn)
circ = circuit_get_by_circid_orconn(circ_id, p_conn); circ = circuit_get_by_circid_orconn(circ_id, p_conn);
if (success == 0) { if (success == 0) {
debug(LD_OR,"decoding onionskin failed. (Old key or bad sw.) Closing."); debug(LD_OR,"decoding onionskin failed. (Old key or bad software.) Closing.");
if (circ) if (circ)
circuit_mark_for_close(circ); circuit_mark_for_close(circ);
goto done_processing; goto done_processing;
} }
if (!circ) { if (!circ) {
/*XXXX Why does this happen?*/ /* This happens because somebody sends us a destroy cell and the
* circuit goes away, while the cpuworker is working. This is also
* why our tag doesn't include a pointer to the circ, because we'd
* never know if it's still valid.
*/
debug(LD_OR,"processed onion for a circ that's gone. Dropping."); debug(LD_OR,"processed onion for a circ that's gone. Dropping.");
goto done_processing; goto done_processing;
} }
@ -259,7 +263,7 @@ cpuworker_main(void *data)
} }
if (read_all(fd, question, ONIONSKIN_CHALLENGE_LEN, 1) != ONIONSKIN_CHALLENGE_LEN) { if (read_all(fd, question, ONIONSKIN_CHALLENGE_LEN, 1) != ONIONSKIN_CHALLENGE_LEN) {
info(LD_BUG,"read question failed. Exiting."); err(LD_BUG,"read question failed. Exiting.");
goto end; goto end;
} }

2
src/or/directory.c
View File

@ -814,7 +814,7 @@ connection_dir_client_reached_eof(connection_t *conn)
&body, &body_len, MAX_DIR_SIZE, &body, &body_len, MAX_DIR_SIZE,
allow_partial)) { allow_partial)) {
case -1: /* overflow */ case -1: /* overflow */
warn(LD_BUG,"'fetch' response too large (server '%s:%d'). Closing.", conn->address, conn->port); warn(LD_PROTOCOL,"'fetch' response too large (server '%s:%d'). Closing.", conn->address, conn->port);
return -1; return -1;
case 0: case 0:
info(LD_HTTP,"'fetch' response not all here, but we're at eof. Closing."); info(LD_HTTP,"'fetch' response not all here, but we're at eof. Closing.");