diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-07-22 03:47:20 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-07-22 03:47:20 +0000 |
| commit | eb0a19c47536633497b778924cd987dc8c877a36 (patch) | |
| tree | 8b697e8e5e77263c4f7dd08741fc219740fe270b | |
| parent | ca9604e477c617681b612316a917024c65f36492 (diff) | |
| download | tor-eb0a19c47536633497b778924cd987dc8c877a36.tar.gz tor-eb0a19c47536633497b778924cd987dc8c877a36.zip | |
change 0.0.8 extend cell format so it's compatible with 0.0.7
svn:r2094
| -rw-r--r-- | src/or/circuitbuild.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 5887437931..40c57e01b0 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -401,15 +401,10 @@ int circuit_send_next_onion_skin(circuit_t *circ) { *(uint32_t*)payload = htonl(hop->addr); *(uint16_t*)(payload+4) = htons(hop->port); - if (strncmp(router->platform, "Tor 0.0.7", 9)) { - /* Before 0.0.8, we didn't support the long payload format. */ - memcpy(payload+2+4, hop->identity_digest, DIGEST_LEN); - onionskin = payload+2+4+DIGEST_LEN; - payload_len = 2+4+DIGEST_LEN+ONIONSKIN_CHALLENGE_LEN; - } else { - onionskin = payload+2+4; - payload_len = 2+4+ONIONSKIN_CHALLENGE_LEN; - } + + onionskin = payload+2+4; + memcpy(payload+2+4+ONIONSKIN_CHALLENGE_LEN, hop->identity_digest, DIGEST_LEN); + payload_len = 2+4+ONIONSKIN_CHALLENGE_LEN+DIGEST_LEN; if(onion_skin_create(router->onion_pkey, &(hop->handshake_state), onionskin) < 0) { log_fn(LOG_WARN,"onion_skin_create failed."); @@ -450,7 +445,7 @@ int circuit_extend(cell_t *cell, circuit_t *circ) { /* Once this format is no longer supported, nobody will use * connection_*_get_by_addr_port. */ old_format = 1; - } else if (rh.length == 4+2+DIGEST_LEN+ONIONSKIN_CHALLENGE_LEN) { + } else if (rh.length == 4+2+ONIONSKIN_CHALLENGE_LEN+DIGEST_LEN) { old_format = 0; } else { log_fn(LOG_WARN, "Wrong length on extend cell. Closing circuit."); @@ -464,9 +459,9 @@ int circuit_extend(cell_t *cell, circuit_t *circ) { n_conn = connection_twin_get_by_addr_port(circ->n_addr,circ->n_port); onionskin = cell->payload+RELAY_HEADER_SIZE+4+2; } else { - id_digest = cell->payload+RELAY_HEADER_SIZE+4+2; + onionskin = cell->payload+RELAY_HEADER_SIZE+4+2; + id_digest = cell->payload+RELAY_HEADER_SIZE+4+2+ONIONSKIN_CHALLENGE_LEN; n_conn = connection_get_by_identity_digest(id_digest, CONN_TYPE_OR); - onionskin = cell->payload+RELAY_HEADER_SIZE+4+2+DIGEST_LEN; } if(!n_conn) { /* we should try to open a connection */ |