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

clean up some presentation and comments

Browse Source 
svn:r1294
This commit is contained in:
Roger Dingledine 2004-03-18 19:22:56 +00:00
parent c01253da96
commit 208625ae31
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/or/circuit.c
View File

@ -826,7 +826,7 @@ circuit_dump_details(int severity, circuit_t *circ, int poll_index,
log(severity,"Building: desired len %d, planned exit node %s.",
circ->build_state->desired_path_len, circ->build_state->chosen_exit);
for(hop=circ->cpath;hop->next != circ->cpath; hop=hop->next)
log(severity,"hop: state %d, addr %x, port %d", hop->state,
log(severity,"hop: state %d, addr 0x%.8x, port %d", hop->state,
(unsigned int)hop->addr,
(int)hop->port);
}
@ -1152,15 +1152,15 @@ int circuit_finish_handshake(circuit_t *circ, char *reply) {
crypto_dh_free(hop->handshake_state); /* don't need it anymore */
hop->handshake_state = NULL;
log_fn(LOG_DEBUG,"hop init digest forward %u, backward %u.",
(unsigned)*(uint32_t*)keys, (unsigned)*(uint32_t*)(keys+20));
log_fn(LOG_DEBUG,"hop init digest forward 0x%.8x, backward 0x%.8x.",
(unsigned int)*(uint32_t*)keys, (unsigned int)*(uint32_t*)(keys+20));
hop->f_digest = crypto_new_digest_env(CRYPTO_SHA1_DIGEST);
crypto_digest_add_bytes(hop->f_digest, keys, 20);
hop->b_digest = crypto_new_digest_env(CRYPTO_SHA1_DIGEST);
crypto_digest_add_bytes(hop->b_digest, keys+20, 20);
log_fn(LOG_DEBUG,"hop init cipher forward %u, backward %u.",
(unsigned)*(uint32_t*)(keys+40), (unsigned) *(uint32_t*)(keys+40+16));
log_fn(LOG_DEBUG,"hop init cipher forward 0x%.8x, backward 0x%.8x.",
(unsigned int)*(uint32_t*)(keys+40), (unsigned int)*(uint32_t*)(keys+40+16));
if (!(hop->f_crypto =
crypto_create_init_cipher(CIRCUIT_CIPHER,keys+40,iv,1))) {
log(LOG_WARN,"forward cipher initialization failed.");

6
src/or/main.c
View File

@ -54,7 +54,7 @@ int has_completed_circuit=0;
int connection_add(connection_t *conn) {
if(nfds >= options.MaxConn-1) {
log(LOG_WARN,"connection_add(): failing because nfds is too high.");
log_fn(LOG_WARN,"failing because nfds is too high.");
return -1;
}
@ -68,7 +68,7 @@ int connection_add(connection_t *conn) {
nfds++;
log(LOG_INFO,"connection_add(): new conn type %s, socket %d, nfds %d.",
log_fn(LOG_INFO,"new conn type %s, socket %d, nfds %d.",
CONN_TYPE_TO_STRING(conn->type), conn->s, nfds);
return 0;
@ -102,7 +102,7 @@ int connection_remove(connection_t *conn) {
return 0;
}
/* we replace this one with the one at the end, then free it */
/* replace this one with the one at the end */
nfds--;
poll_array[current_index].fd = poll_array[nfds].fd;
poll_array[current_index].events = poll_array[nfds].events;

8
src/or/onion.c
View File

@ -131,15 +131,15 @@ int onionskin_answer(circuit_t *circ, unsigned char *payload, unsigned char *key
memcpy(cell.payload, payload, ONIONSKIN_REPLY_LEN);
log_fn(LOG_INFO,"init digest forward %d, backward %d.",
(int)*(uint32_t*)(keys), (int)*(uint32_t*)(keys+20));
log_fn(LOG_INFO,"init digest forward 0x%.8x, backward 0x%.8x.",
(unsigned int)*(uint32_t*)(keys), (unsigned int)*(uint32_t*)(keys+20));
circ->n_digest = crypto_new_digest_env(CRYPTO_SHA1_DIGEST);
crypto_digest_add_bytes(circ->n_digest, keys, 20);
circ->p_digest = crypto_new_digest_env(CRYPTO_SHA1_DIGEST);
crypto_digest_add_bytes(circ->p_digest, keys+20, 20);
log_fn(LOG_DEBUG,"init cipher forward %d, backward %d.",
(int)*(uint32_t*)(keys+40), (int)*(uint32_t*)(keys+40+16));
log_fn(LOG_DEBUG,"init cipher forward 0x%.8x, backward 0x%.8x.",
(unsigned int)*(uint32_t*)(keys+40), (unsigned int)*(uint32_t*)(keys+40+16));
if (!(circ->n_crypto =
crypto_create_init_cipher(CIRCUIT_CIPHER,keys+40,iv,0))) {
log_fn(LOG_WARN,"Cipher initialization failed (n).");