aboutsummaryrefslogtreecommitdiff
path: root/src/or
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-04-26 23:02:20 +0000
committerRoger Dingledine <arma@torproject.org>2004-04-26 23:02:20 +0000
commitd7f4b8237359d8e8e256a53a8a68651d75071fa4 (patch)
treea629d09d7f3fdc7e818613ce032e873e440f07ea /src/or
parentd6d4b93863eb39b7ad084b694446f44499de16e8 (diff)
downloadtor-d7f4b8237359d8e8e256a53a8a68651d75071fa4.tar
tor-d7f4b8237359d8e8e256a53a8a68651d75071fa4.tar.gz
rendmid says it drops but actually sends nack
fix log messages svn:r1725
Diffstat (limited to 'src/or')
-rw-r--r--src/or/rendmid.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 80e7818f9..b40e81b48 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -123,7 +123,7 @@ rend_mid_introduce(circuit_t *circ, const char *request, int request_len)
if (request_len < (DIGEST_LEN+(MAX_NICKNAME_LEN+1)+REND_COOKIE_LEN+
DH_KEY_LEN+CIPHER_KEY_LEN+PKCS1_OAEP_PADDING_OVERHEAD)) {
log_fn(LOG_WARN,
- "Impossibly short INTRODUCE1 cell on circuit %d; dropping.",
+ "Impossibly short INTRODUCE1 cell on circuit %d; responding with nack.",
circ->p_circ_id);
goto err;
}
@@ -132,13 +132,12 @@ rend_mid_introduce(circuit_t *circ, const char *request, int request_len)
goto err;
}
-
/* The first 20 bytes are all we look at: they have a hash of Bob's PK. */
intro_circ = circuit_get_next_by_pk_and_purpose(
NULL, request, CIRCUIT_PURPOSE_INTRO_POINT);
if (!intro_circ) {
log_fn(LOG_WARN,
- "No intro circ found for INTRODUCE1 cell (%s) from circuit %d; dropping",
+ "No intro circ found for INTRODUCE1 cell (%s) from circuit %d; responding with nack",
serviceid, circ->p_circ_id);
goto err;
}
@@ -164,7 +163,7 @@ rend_mid_introduce(circuit_t *circ, const char *request, int request_len)
return 0;
err:
- /* Send the client an ACK */
+ /* Send the client an NACK */
nak_body[0] = 1;
if (connection_edge_send_command(NULL,circ,RELAY_COMMAND_INTRODUCE_ACK,
nak_body, 1, NULL)) {