aboutsummaryrefslogtreecommitdiff
path: root/src/or/rendmid.c
diff options
context:
space:
mode:
authorRobert Ransom <rransom.8774@gmail.com>2011-11-24 06:52:38 -0800
committerRobert Ransom <rransom.8774@gmail.com>2011-11-24 06:52:38 -0800
commit104c50fedb1b9217fbb2a8cc5fcf9ec9c9be2674 (patch)
tree42003d995346a7a91035d32946eb332c6cacabdb /src/or/rendmid.c
parentd0ed7cbf8b83f675dcd858abbdfda98eb3bafc88 (diff)
downloadtor-104c50fedb1b9217fbb2a8cc5fcf9ec9c9be2674.tar
tor-104c50fedb1b9217fbb2a8cc5fcf9ec9c9be2674.tar.gz
Log whenever a circuit's purpose is changed
Diffstat (limited to 'src/or/rendmid.c')
-rw-r--r--src/or/rendmid.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 04edd8e3e..d74098063 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -9,6 +9,7 @@
#include "or.h"
#include "circuitlist.h"
+#include "circuituse.h"
#include "config.h"
#include "relay.h"
#include "rendmid.h"
@@ -109,7 +110,7 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request,
}
/* Now, set up this circuit. */
- circ->_base.purpose = CIRCUIT_PURPOSE_INTRO_POINT;
+ circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_INTRO_POINT);
memcpy(circ->rend_token, pk_digest, DIGEST_LEN);
log_info(LD_REND,
@@ -249,7 +250,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request,
goto err;
}
- circ->_base.purpose = CIRCUIT_PURPOSE_REND_POINT_WAITING;
+ circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_REND_POINT_WAITING);
memcpy(circ->rend_token, request, REND_COOKIE_LEN);
base16_encode(hexid,9,(char*)request,4);
@@ -324,8 +325,9 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,
"Completing rendezvous: circuit %d joins circuit %d (cookie %s)",
circ->p_circ_id, rend_circ->p_circ_id, hexid);
- circ->_base.purpose = CIRCUIT_PURPOSE_REND_ESTABLISHED;
- rend_circ->_base.purpose = CIRCUIT_PURPOSE_REND_ESTABLISHED;
+ circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_REND_ESTABLISHED);
+ circuit_change_purpose(TO_CIRCUIT(rend_circ),
+ CIRCUIT_PURPOSE_REND_ESTABLISHED);
memset(circ->rend_token, 0, REND_COOKIE_LEN);
rend_circ->rend_splice = circ;