aboutsummaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2003-11-11 03:01:48 +0000
committerNick Mathewson <nickm@torproject.org>2003-11-11 03:01:48 +0000
commit7bde42676b0e25ed422f842e82169375cd13fc5e (patch)
treedcd9e929c4970c8b88d542f0b8738184e3a41a7d /src/or/connection_or.c
parentdafb0e6a6eddc8b0fbf6de4292d49a311b2e712a (diff)
downloadtor-7bde42676b0e25ed422f842e82169375cd13fc5e.tar
tor-7bde42676b0e25ed422f842e82169375cd13fc5e.tar.gz
Rename aci to circ_id throughout.
svn:r784
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index ebc24c495..e768f13be 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -12,7 +12,7 @@ static int connection_or_process_cell_from_inbuf(connection_t *conn);
/**************************************************************/
static void cell_pack(char *dest, const cell_t *src) {
- *(uint16_t*)dest = htons(src->aci);
+ *(uint16_t*)dest = htons(src->circ_id);
*(uint8_t*)(dest+2) = src->command;
*(uint8_t*)(dest+3) = src->length;
*(uint32_t*)(dest+4) = 0; /* Reserved */
@@ -20,7 +20,7 @@ static void cell_pack(char *dest, const cell_t *src) {
}
static void cell_unpack(cell_t *dest, const char *src) {
- dest->aci = ntohs(*(uint16_t*)(src));
+ dest->circ_id = ntohs(*(uint16_t*)(src));
dest->command = *(uint8_t*)(src+2);
dest->length = *(uint8_t*)(src+3);
dest->seq = ntohl(*(uint32_t*)(src+4));