[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] populate circ->n_conn_id_digest when we set circ->n_conn
- To: or-cvs@freehaven.net
- Subject: [or-cvs] populate circ->n_conn_id_digest when we set circ->n_conn
- From: arma@seul.org (Roger Dingledine)
- Date: Fri, 2 Jul 2004 21:38:01 -0400 (EDT)
- Delivered-to: archiver@seul.org
- Delivered-to: or-cvs-outgoing@seul.org
- Delivered-to: or-cvs@seul.org
- Delivery-date: Fri, 02 Jul 2004 21:38:09 -0400
- Reply-to: or-dev@freehaven.net
- Sender: owner-or-cvs@freehaven.net
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or
Modified Files:
circuitbuild.c
Log Message:
populate circ->n_conn_id_digest when we set circ->n_conn
Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuitbuild.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- circuitbuild.c 2 Jul 2004 23:40:03 -0000 1.7
+++ circuitbuild.c 3 Jul 2004 01:37:59 -0000 1.8
@@ -245,6 +245,7 @@
circ->n_addr = n_conn->addr;
circ->n_port = n_conn->port;
circ->n_conn = n_conn;
+ memcpy(circ->n_conn_id_digest, n_conn->identity_digest, DIGEST_LEN);
log_fn(LOG_DEBUG,"Conn open. Delivering first onion skin.");
if(circuit_send_next_onion_skin(circ) < 0) {
log_fn(LOG_INFO,"circuit_send_next_onion_skin failed.");
@@ -276,6 +277,7 @@
}
log_fn(LOG_DEBUG,"Found circ %d, sending create cell.", circ->n_circ_id);
circ->n_conn = or_conn;
+ memcpy(circ->n_conn_id_digest, or_conn->identity_digest, DIGEST_LEN);
if(CIRCUIT_IS_ORIGIN(circ)) {
if(circuit_send_next_onion_skin(circ) < 0) {
log_fn(LOG_INFO,"send_next_onion_skin failed; circuit marked for closing.");
@@ -506,6 +508,7 @@
circ->n_port = n_conn->port;
circ->n_conn = n_conn;
+ memcpy(circ->n_conn_id_digest, n_conn->identity_digest, DIGEST_LEN);
log_fn(LOG_DEBUG,"n_conn is %s:%u",n_conn->address,n_conn->port);
if(circuit_deliver_create_cell(circ, onionskin) < 0)