Rename aci to circ_id throughout.

svn:r784

src/or/circuit.c

@@ -8,7 +8,7 @@ extern or_options_t options; /* command-line and config-file options */
 
 static void circuit_free_cpath(crypt_path_t *cpath);
 static void circuit_free_cpath_node(crypt_path_t *victim);
-static aci_t get_unique_aci_by_addr_port(uint32_t addr, uint16_t port, int aci_type);  
+static circ_id_t get_unique_circ_id_by_addr_port(uint32_t addr, uint16_t port, int circ_id_type);  
 
 unsigned long stats_n_relay_cells_relayed = 0;
 unsigned long stats_n_relay_cells_delivered = 0;
@@ -56,7 +56,7 @@ void circuit_remove(circuit_t *circ) {
   }
 }
 
-circuit_t *circuit_new(aci_t p_aci, connection_t *p_conn) {
+circuit_t *circuit_new(circ_id_t p_circ_id, connection_t *p_conn) {
   circuit_t *circ; 
 
   circ = (circuit_t *)tor_malloc(sizeof(circuit_t));
@@ -64,14 +64,14 @@ circuit_t *circuit_new(aci_t p_aci, connection_t *p_conn) {
 
   circ->timestamp_created = time(NULL);
 
-  circ->p_aci = p_aci;
+  circ->p_circ_id = p_circ_id;
   circ->p_conn = p_conn;
 
   circ->state = CIRCUIT_STATE_ONIONSKIN_PENDING;
 
-  /* ACIs */
-  circ->p_aci = p_aci;
-  /* circ->n_aci remains 0 because we haven't identified the next hop yet */
+  /* CircIDs */
+  circ->p_circ_id = p_circ_id;
+  /* circ->n_circ_id remains 0 because we haven't identified the next hop yet */
 
   circ->package_window = CIRCWINDOW_START;
   circ->deliver_window = CIRCWINDOW_START;
@@ -117,31 +117,31 @@ static void circuit_free_cpath_node(crypt_path_t *victim) {
   free(victim);
 }
 
-/* return 0 if can't get a unique aci. */
-static aci_t get_unique_aci_by_addr_port(uint32_t addr, uint16_t port, int aci_type) {
-  aci_t test_aci;
+/* return 0 if can't get a unique circ_id. */
+static circ_id_t get_unique_circ_id_by_addr_port(uint32_t addr, uint16_t port, int circ_id_type) {
+  circ_id_t test_circ_id;
   connection_t *conn;
   uint16_t high_bit;
 
-  high_bit = (aci_type == ACI_TYPE_HIGHER) ? 1<<15 : 0;
+  high_bit = (circ_id_type == CIRC_ID_TYPE_HIGHER) ? 1<<15 : 0;
   conn = connection_exact_get_by_addr_port(addr,port);
   /* XXX race condition: if conn is marked_for_close it won't be noticed */
   if (!conn)
     return (1|high_bit); /* No connection exists; conflict is impossible. */
 
   do {
-    /* Sequentially iterate over test_aci=1...1<<15-1 until we find an
-     * aci such that (high_bit|test_aci) is not already used. */
-    /* XXX Will loop forever if all aci's in our range are used.
+    /* Sequentially iterate over test_circ_id=1...1<<15-1 until we find an
+     * circID such that (high_bit|test_circ_id) is not already used. */
+    /* XXX Will loop forever if all circ_id's in our range are used.
      * This matters because it's an external DoS vulnerability. */
-    test_aci = conn->next_aci++;
-    if (test_aci == 0 || test_aci >= 1<<15) {
-      test_aci = 1;
-      conn->next_aci = 2;
+    test_circ_id = conn->next_circ_id++;
+    if (test_circ_id == 0 || test_circ_id >= 1<<15) {
+      test_circ_id = 1;
+      conn->next_circ_id = 2;
     }
-    test_aci |= high_bit;
-  } while(circuit_get_by_aci_conn(test_aci, conn));
-  return test_aci;
+    test_circ_id |= high_bit;
+  } while(circuit_get_by_circ_id_conn(test_circ_id, conn));
+  return test_circ_id;
 }
 
 circuit_t *circuit_enumerate_by_naddr_nport(circuit_t *circ, uint32_t naddr, uint16_t nport) {
@@ -158,12 +158,12 @@ circuit_t *circuit_enumerate_by_naddr_nport(circuit_t *circ, uint32_t naddr, uin
   return NULL;
 }
 
-circuit_t *circuit_get_by_aci_conn(aci_t aci, connection_t *conn) {
+circuit_t *circuit_get_by_circ_id_conn(circ_id_t circ_id, connection_t *conn) {
   circuit_t *circ;
   connection_t *tmpconn;
 
   for(circ=global_circuitlist;circ;circ = circ->next) {
-    if(circ->p_aci == aci) {
+    if(circ->p_circ_id == circ_id) {
       if(circ->p_conn == conn)
         return circ;
       for(tmpconn = circ->p_streams; tmpconn; tmpconn = tmpconn->next_stream) {
@@ -171,7 +171,7 @@ circuit_t *circuit_get_by_aci_conn(aci_t aci, connection_t *conn) {
           return circ;
       }
     }
-    if(circ->n_aci == aci) {
+    if(circ->n_circ_id == circ_id) {
       if(circ->n_conn == conn)
         return circ;
       for(tmpconn = circ->n_streams; tmpconn; tmpconn = tmpconn->next_stream) {
@@ -208,8 +208,8 @@ circuit_t *circuit_get_newest_open(void) {
   for(circ=global_circuitlist;circ;circ = circ->next) {
     if(circ->cpath && circ->state == CIRCUIT_STATE_OPEN && circ->n_conn && (!bestcirc ||
       bestcirc->timestamp_created < circ->timestamp_created)) {
-      log_fn(LOG_DEBUG,"Choosing circuit %s:%d:%d.", circ->n_conn->address, circ->n_port, circ->n_aci);
-      assert(circ->n_aci);
+      log_fn(LOG_DEBUG,"Choosing circuit %s:%d:%d.", circ->n_conn->address, circ->n_port, circ->n_circ_id);
+      assert(circ->n_circ_id);
       bestcirc = circ;
     }
   }
@@ -309,8 +309,8 @@ int relay_crypt(circuit_t *circ, char *in, int inlen, char cell_direction,
 
       log_fn(LOG_DEBUG,"before encrypt: %d",*(int*)(in+2));
       if(crypto_cipher_encrypt(circ->p_crypto, in, inlen, out)) {
-        log_fn(LOG_WARN,"Onion encryption failed for ACI %u: %s",
-            circ->p_aci, crypto_perror());
+        log_fn(LOG_WARN,"Onion encryption failed for circID %u: %s",
+               circ->p_circ_id, crypto_perror());
         return -1;
       }
       memcpy(in,out,inlen);
@@ -341,8 +341,8 @@ int relay_crypt(circuit_t *circ, char *in, int inlen, char cell_direction,
     } else { /* we're in the middle. Just one crypt. */
 
       if(crypto_cipher_decrypt(circ->n_crypto,in, inlen, out)) {
-        log_fn(LOG_WARN,"Decryption failed for ACI %u: %s",
-               circ->n_aci, crypto_perror());
+        log_fn(LOG_WARN,"Decryption failed for circID %u: %s",
+               circ->n_circ_id, crypto_perror());
         return -1;
       }
       memcpy(in,out,inlen);
@@ -455,7 +455,7 @@ int circuit_consider_sending_sendme(circuit_t *circ, int edge_type, crypt_path_t
 
   cell.length = RELAY_HEADER_SIZE;
   if(edge_type == EDGE_AP) { /* i'm the AP */
-    cell.aci = circ->n_aci;
+    cell.circ_id = circ->n_circ_id;
     while(layer_hint->deliver_window < CIRCWINDOW_START-CIRCWINDOW_INCREMENT) {
       log_fn(LOG_DEBUG,"deliver_window %d, Queueing sendme forward.", layer_hint->deliver_window);
       layer_hint->deliver_window += CIRCWINDOW_INCREMENT;
@@ -464,7 +464,7 @@ int circuit_consider_sending_sendme(circuit_t *circ, int edge_type, crypt_path_t
       }
     }
   } else if(edge_type == EDGE_EXIT) { /* i'm the exit */
-    cell.aci = circ->p_aci;
+    cell.circ_id = circ->p_circ_id;
     while(circ->deliver_window < CIRCWINDOW_START-CIRCWINDOW_INCREMENT) {
       log_fn(LOG_DEBUG,"deliver_window %d, Queueing sendme back.", circ->deliver_window);
       circ->deliver_window += CIRCWINDOW_INCREMENT;
@@ -487,14 +487,14 @@ void circuit_close(circuit_t *circ) {
   }
   circuit_remove(circ);
   if(circ->n_conn)
-    connection_send_destroy(circ->n_aci, circ->n_conn);
+    connection_send_destroy(circ->n_circ_id, circ->n_conn);
   for(conn=circ->n_streams; conn; conn=conn->next_stream) {
-    connection_send_destroy(circ->n_aci, conn); 
+    connection_send_destroy(circ->n_circ_id, conn); 
   }
   if(circ->p_conn)
-    connection_send_destroy(circ->n_aci, circ->p_conn);
+    connection_send_destroy(circ->n_circ_id, circ->p_conn);
   for(conn=circ->p_streams; conn; conn=conn->next_stream) {
-    connection_send_destroy(circ->p_aci, conn); 
+    connection_send_destroy(circ->p_circ_id, conn); 
   }
   if(options.SocksPort && youngest == circ) { /* check this after we've sent the destroys, to reduce races */
     /* our current circuit just died. Launch another one pronto. */
@@ -572,21 +572,21 @@ void circuit_dump_by_conn(connection_t *conn, int severity) {
 
   for(circ=global_circuitlist;circ;circ = circ->next) {
     if(circ->p_conn == conn)
-      log(severity, "Conn %d has App-ward circuit:  aci %d (other side %d), state %d (%s)",
-        conn->poll_index, circ->p_aci, circ->n_aci, circ->state, circuit_state_to_string[circ->state]);
+      log(severity, "Conn %d has App-ward circuit:  circID %d (other side %d), state %d (%s)",
+        conn->poll_index, circ->p_circ_id, circ->n_circ_id, circ->state, circuit_state_to_string[circ->state]);
     for(tmpconn=circ->p_streams; tmpconn; tmpconn=tmpconn->next_stream) {
       if(tmpconn == conn) {
-        log(severity,"Conn %d has App-ward circuit:  aci %d (other side %d), state %d (%s)",
-          conn->poll_index, circ->p_aci, circ->n_aci, circ->state, circuit_state_to_string[circ->state]);
+        log(severity,"Conn %d has App-ward circuit:  circID %d (other side %d), state %d (%s)",
+          conn->poll_index, circ->p_circ_id, circ->n_circ_id, circ->state, circuit_state_to_string[circ->state]);
       }
     }
     if(circ->n_conn == conn)
-      log(severity,"Conn %d has Exit-ward circuit: aci %d (other side %d), state %d (%s)",
-        conn->poll_index, circ->n_aci, circ->p_aci, circ->state, circuit_state_to_string[circ->state]);
+      log(severity,"Conn %d has Exit-ward circuit: circID %d (other side %d), state %d (%s)",
+        conn->poll_index, circ->n_circ_id, circ->p_circ_id, circ->state, circuit_state_to_string[circ->state]);
     for(tmpconn=circ->n_streams; tmpconn; tmpconn=tmpconn->next_stream) {
       if(tmpconn == conn) {
-        log(severity,"Conn %d has Exit-ward circuit: aci %d (other side %d), state %d (%s)",
-          conn->poll_index, circ->n_aci, circ->p_aci, circ->state, circuit_state_to_string[circ->state]);
+        log(severity,"Conn %d has Exit-ward circuit: circID %d (other side %d), state %d (%s)",
+          conn->poll_index, circ->n_circ_id, circ->p_circ_id, circ->state, circuit_state_to_string[circ->state]);
       }
     }
   }
@@ -603,7 +603,7 @@ void circuit_expire_unused_circuits(void) {
     tmpcirc = circ;
     circ = circ->next;
     if(tmpcirc != youngest && !tmpcirc->p_conn && !tmpcirc->p_streams) {
-      log_fn(LOG_DEBUG,"Closing n_aci %d",tmpcirc->n_aci);
+      log_fn(LOG_DEBUG,"Closing n_circ_id %d",tmpcirc->n_circ_id);
       circuit_close(tmpcirc);
     }
   }
@@ -647,7 +647,7 @@ int circuit_establish_circuit(void) {
   connection_t *n_conn;
   circuit_t *circ;
 
-  circ = circuit_new(0, NULL); /* sets circ->p_aci and circ->p_conn */
+  circ = circuit_new(0, NULL); /* sets circ->p_circ_id and circ->p_conn */
   circ->state = CIRCUIT_STATE_OR_WAIT;
   circ->cpath = onion_generate_cpath(&firsthop);
   if(!circ->cpath) {
@@ -728,11 +728,11 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
   if(circ->cpath->state == CPATH_STATE_CLOSED) {
 
     log_fn(LOG_DEBUG,"First skin; sending create cell.");
-    circ->n_aci = get_unique_aci_by_addr_port(circ->n_addr, circ->n_port, ACI_TYPE_BOTH);
+    circ->n_circ_id = get_unique_circ_id_by_addr_port(circ->n_addr, circ->n_port, CIRC_ID_TYPE_BOTH);
 
     memset(&cell, 0, sizeof(cell_t));
     cell.command = CELL_CREATE;
-    cell.aci = circ->n_aci;
+    cell.circ_id = circ->n_circ_id;
     cell.length = DH_ONIONSKIN_LEN;
 
     if(onion_skin_create(circ->n_conn->onion_pkey, &(circ->cpath->handshake_state), cell.payload) < 0) {
@@ -769,7 +769,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
 
     memset(&cell, 0, sizeof(cell_t));
     cell.command = CELL_RELAY; 
-    cell.aci = circ->n_aci;
+    cell.circ_id = circ->n_circ_id;
     SET_CELL_RELAY_COMMAND(cell, RELAY_COMMAND_EXTEND);
     SET_CELL_STREAM_ID(cell, ZERO_STREAM);
 
@@ -798,7 +798,7 @@ int circuit_send_next_onion_skin(circuit_t *circ) {
  */
 int circuit_extend(cell_t *cell, circuit_t *circ) {
   connection_t *n_conn;
-  aci_t aci_type;
+  int circ_id_type;
   cell_t newcell;
 
   if(circ->n_conn) {
@@ -830,19 +830,19 @@ int circuit_extend(cell_t *cell, circuit_t *circ) {
   circ->n_conn = n_conn;
   log_fn(LOG_DEBUG,"n_conn is %s:%u",n_conn->address,n_conn->port);
 
-  aci_type = decide_aci_type(options.Nickname, n_conn->nickname);
+  circ_id_type = decide_circ_id_type(options.Nickname, n_conn->nickname);
 
-  log_fn(LOG_DEBUG,"aci_type = %u.",aci_type);
-  circ->n_aci = get_unique_aci_by_addr_port(circ->n_addr, circ->n_port, aci_type);
-  if(!circ->n_aci) {
-    log_fn(LOG_WARN,"failed to get unique aci.");
+  log_fn(LOG_DEBUG,"circ_id_type = %u.",circ_id_type);
+  circ->n_circ_id = get_unique_circ_id_by_addr_port(circ->n_addr, circ->n_port, circ_id_type);
+  if(!circ->n_circ_id) {
+    log_fn(LOG_WARN,"failed to get unique circID.");
     return -1;
   }
-  log_fn(LOG_DEBUG,"Chosen ACI %u.",circ->n_aci);
+  log_fn(LOG_DEBUG,"Chosen circID %u.",circ->n_circ_id);
 
   memset(&newcell, 0, sizeof(cell_t));
   newcell.command = CELL_CREATE;
-  newcell.aci = circ->n_aci;
+  newcell.circ_id = circ->n_circ_id;
   newcell.length = DH_ONIONSKIN_LEN;
 
   memcpy(newcell.payload, cell->payload+RELAY_HEADER_SIZE+6, DH_ONIONSKIN_LEN);

src/or/command.c

@@ -94,14 +94,14 @@ void command_process_cell(cell_t *cell, connection_t *conn) {
 static void command_process_create_cell(cell_t *cell, connection_t *conn) {
   circuit_t *circ;
 
-  circ = circuit_get_by_aci_conn(cell->aci, conn);
+  circ = circuit_get_by_circ_id_conn(cell->circ_id, conn);
 
   if(circ) {
-    log_fn(LOG_WARN,"received CREATE cell (aci %d) for known circ. Dropping.", cell->aci);
+    log_fn(LOG_WARN,"received CREATE cell (circID %d) for known circ. Dropping.", cell->circ_id);
     return;
   }
 
-  circ = circuit_new(cell->aci, conn);
+  circ = circuit_new(cell->circ_id, conn);
   circ->state = CIRCUIT_STATE_ONIONSKIN_PENDING;
   if(cell->length != DH_ONIONSKIN_LEN) {
     log_fn(LOG_WARN,"Bad cell length %d. Dropping.", cell->length);
@@ -123,14 +123,14 @@ static void command_process_create_cell(cell_t *cell, connection_t *conn) {
 static void command_process_created_cell(cell_t *cell, connection_t *conn) {
   circuit_t *circ;
 
-  circ = circuit_get_by_aci_conn(cell->aci, conn);
+  circ = circuit_get_by_circ_id_conn(cell->circ_id, conn);
 
   if(!circ) {
-    log_fn(LOG_INFO,"(aci %d) unknown circ (probably got a destroy earlier). Dropping.", cell->aci);
+    log_fn(LOG_INFO,"(circID %d) unknown circ (probably got a destroy earlier). Dropping.", cell->circ_id);
     return;
   }
 
-  if(circ->n_aci != cell->aci) {
+  if(circ->n_circ_id != cell->circ_id) {
     log_fn(LOG_WARN,"got created cell from OPward? Closing.");
     circuit_close(circ);
     return;
@@ -160,10 +160,10 @@ static void command_process_created_cell(cell_t *cell, connection_t *conn) {
 static void command_process_relay_cell(cell_t *cell, connection_t *conn) {
   circuit_t *circ;
 
-  circ = circuit_get_by_aci_conn(cell->aci, conn);
+  circ = circuit_get_by_circ_id_conn(cell->circ_id, conn);
 
   if(!circ) {
-    log_fn(LOG_INFO,"unknown circuit %d. Dropping.", cell->aci);
+    log_fn(LOG_INFO,"unknown circuit %d. Dropping.", cell->circ_id);
     return;
   }
 
@@ -173,15 +173,15 @@ static void command_process_relay_cell(cell_t *cell, connection_t *conn) {
     return;
   }
 
-  if(cell->aci == circ->p_aci) { /* it's an outgoing cell */
-    cell->aci = circ->n_aci; /* switch it */
+  if(cell->circ_id == circ->p_circ_id) { /* it's an outgoing cell */
+    cell->circ_id = circ->n_circ_id; /* switch it */
     if(circuit_deliver_relay_cell(cell, circ, CELL_DIRECTION_OUT, conn->cpath_layer) < 0) {
       log_fn(LOG_WARN,"circuit_deliver_relay_cell (forward) failed. Closing.");
       circuit_close(circ);
       return;
     }
   } else { /* it's an ingoing cell */
-    cell->aci = circ->p_aci; /* switch it */
+    cell->circ_id = circ->p_circ_id; /* switch it */
     if(circuit_deliver_relay_cell(cell, circ, CELL_DIRECTION_IN, NULL) < 0) {
       log_fn(LOG_WARN,"circuit_deliver_relay_cell (backward) failed. Closing.");
       circuit_close(circ);
@@ -193,19 +193,19 @@ static void command_process_relay_cell(cell_t *cell, connection_t *conn) {
 static void command_process_destroy_cell(cell_t *cell, connection_t *conn) {
   circuit_t *circ;
 
-  circ = circuit_get_by_aci_conn(cell->aci, conn);
+  circ = circuit_get_by_circ_id_conn(cell->circ_id, conn);
 
   if(!circ) {
-    log_fn(LOG_INFO,"unknown circuit %d. Dropping.", cell->aci);
+    log_fn(LOG_INFO,"unknown circuit %d. Dropping.", cell->circ_id);
     return;
   }
 
-  log_fn(LOG_DEBUG,"Received for aci %d.",cell->aci);
+  log_fn(LOG_DEBUG,"Received for circIDD %d.",cell->circ_id);
   if(circ->state == CIRCUIT_STATE_ONIONSKIN_PENDING) {
     onion_pending_remove(circ);
   }
 
-  if(cell->aci == circ->p_aci || circ->cpath) {
+  if(cell->circ_id == circ->p_circ_id || circ->cpath) {
     /* either the destroy came from behind, or we're the AP */
     circ->p_conn = NULL;
     circuit_close(circ);

src/or/connection.c

@@ -639,22 +639,23 @@ int connection_state_is_open(connection_t *conn) {
   return 0;
 }
 
-int connection_send_destroy(aci_t aci, connection_t *conn) {
+int connection_send_destroy(circ_id_t circ_id, connection_t *conn) {
   cell_t cell;
 
   assert(conn);
 
   if(!connection_speaks_cells(conn)) {
-     log_fn(LOG_INFO,"Aci %d: At an edge. Marking connection for close.", aci);
+     log_fn(LOG_INFO,"CircID %d: At an edge. Marking connection for close.", 
+            circ_id);
      connection_edge_end(conn, END_STREAM_REASON_DESTROY, conn->cpath_layer);
      /* if they already sent a destroy, they know. XXX can just close? */
      return 0;
   }
 
   memset(&cell, 0, sizeof(cell_t));
-  cell.aci = aci;
+  cell.circ_id = circ_id;
   cell.command = CELL_DESTROY;
-  log_fn(LOG_INFO,"Sending destroy (aci %d).",aci);
+  log_fn(LOG_INFO,"Sending destroy (circID %d).", circ_id);
   connection_or_write_cell_to_buf(&cell, conn);
   return 0;
 }

src/or/connection_edge.c

@@ -127,11 +127,11 @@ int connection_edge_send_command(connection_t *fromconn, circuit_t *circ, int re
 
   memset(&cell, 0, sizeof(cell_t));
   if(fromconn && fromconn->type == CONN_TYPE_AP) {
-    cell.aci = circ->n_aci;
+    cell.circ_id = circ->n_circ_id;
     cell_direction = CELL_DIRECTION_OUT;
   } else {
     /* NOTE: if !fromconn, we assume that it's heading towards the OP */
-    cell.aci = circ->p_aci;
+    cell.circ_id = circ->p_circ_id;
     cell_direction = CELL_DIRECTION_IN;
   }
 
@@ -290,7 +290,7 @@ int connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, connection
         return 0;
       }
       if(circ->n_conn) {
-        connection_send_destroy(circ->n_aci, circ->n_conn);
+        connection_send_destroy(circ->n_circ_id, circ->n_conn);
         circ->n_conn = NULL;
       }
       log_fn(LOG_DEBUG, "Processed 'truncate', replying.");
@@ -575,7 +575,7 @@ static int connection_ap_handshake_attach_circuit(connection_t *conn) {
   circ->dirty = 1;
 
   /* add it into the linked list of streams on this circuit */
-  log_fn(LOG_DEBUG,"attaching new conn to circ. n_aci %d.", circ->n_aci);
+  log_fn(LOG_DEBUG,"attaching new conn to circ. n_circ_id %d.", circ->n_circ_id);
   conn->next_stream = circ->p_streams;
   circ->p_streams = conn;
 
@@ -621,7 +621,7 @@ static int connection_ap_handshake_send_begin(connection_t *ap_conn, circuit_t *
   ap_conn->state = AP_CONN_STATE_OPEN;
   tor_free(ap_conn->socks_request);
   ap_conn->socks_request = NULL;
-  log_fn(LOG_INFO,"Address/port sent, ap socket %d, n_aci %d",ap_conn->s,circ->n_aci);
+  log_fn(LOG_INFO,"Address/port sent, ap socket %d, n_circ_id %d",ap_conn->s,circ->n_circ_id);
   return 0;
 }
 

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));

src/or/cpuworker.c

@@ -30,28 +30,28 @@ int connection_cpu_finished_flushing(connection_t *conn) {
   return 0;
 }
 
-static void tag_pack(char *tag, uint32_t addr, uint16_t port, aci_t aci) {
+static void tag_pack(char *tag, uint32_t addr, uint16_t port, circ_id_t circ_id) {
   *(uint32_t *)tag = addr;
   *(uint16_t *)(tag+4) = port;
-  *(aci_t *)(tag+6) = aci;
+  *(circ_id_t *)(tag+6) = circ_id;
 }
 
-static void tag_unpack(char *tag, uint32_t *addr, uint16_t *port, aci_t *aci) {
+static void tag_unpack(char *tag, uint32_t *addr, uint16_t *port, circ_id_t *circ_id) {
   struct in_addr in;
 
   *addr = *(uint32_t *)tag;
   *port = *(uint16_t *)(tag+4);
-  *aci = *(aci_t *)(tag+6);
+  *circ_id = *(circ_id_t *)(tag+6);
 
   in.s_addr = htonl(*addr);
-  log_fn(LOG_DEBUG,"onion was from %s:%d, aci %d.", inet_ntoa(in), *port, *aci);
+  log_fn(LOG_DEBUG,"onion was from %s:%d, circ_id %d.", inet_ntoa(in), *port, *circ_id);
 }
 
 int connection_cpu_process_inbuf(connection_t *conn) {
   unsigned char buf[LEN_ONION_RESPONSE];
   uint32_t addr;
   uint16_t port;
-  aci_t aci;
+  circ_id_t circ_id;
   connection_t *p_conn;
   circuit_t *circ;
 
@@ -75,11 +75,11 @@ int connection_cpu_process_inbuf(connection_t *conn) {
     connection_fetch_from_buf(buf,LEN_ONION_RESPONSE,conn);
 
     /* parse out the circ it was talking about */
-    tag_unpack(buf+1, &addr, &port, &aci);
+    tag_unpack(buf+1, &addr, &port, &circ_id);
     circ = NULL;
     p_conn = connection_exact_get_by_addr_port(addr,port);
     if(p_conn)
-      circ = circuit_get_by_aci_conn(aci, p_conn);
+      circ = circuit_get_by_circ_id_conn(circ_id, p_conn);
 
     if(!circ) {
       log_fn(LOG_INFO,"processed onion for a circ that's gone. Dropping.");
@@ -262,7 +262,7 @@ int assign_to_cpuworker(connection_t *cpuworker, unsigned char question_type,
       log_fn(LOG_INFO,"circ->p_conn gone. Failing circ.");
       return -1;
     }
-    tag_pack(tag, circ->p_conn->addr, circ->p_conn->port, circ->p_aci);
+    tag_pack(tag, circ->p_conn->addr, circ->p_conn->port, circ->p_circ_id);
 
     cpuworker->state = CPUWORKER_STATE_BUSY_ONION;
     num_cpuworkers_busy++;

src/or/onion.c

@@ -8,17 +8,17 @@ extern or_options_t options; /* command-line and config-file options */
 
 static int count_acceptable_routers(routerinfo_t **rarray, int rarray_len);
 
-int decide_aci_type(char *local_nick, char *remote_nick) {
+int decide_circ_id_type(char *local_nick, char *remote_nick) {
   int result;
  
   assert(remote_nick);
   if(!local_nick)
-    return ACI_TYPE_LOWER;
+    return CIRC_ID_TYPE_LOWER;
   result = strcmp(local_nick, remote_nick);
   assert(result);
   if(result < 0)
-    return ACI_TYPE_LOWER;
-  return ACI_TYPE_HIGHER;
+    return CIRC_ID_TYPE_LOWER;
+  return CIRC_ID_TYPE_HIGHER;
 }
 
 struct onion_queue_t {
@@ -103,7 +103,7 @@ void onion_pending_remove(circuit_t *circ) {
   } else { /* we need to hunt through the rest of the list */
     for( ;tmpo->next && tmpo->next->circ != circ; tmpo=tmpo->next) ;
     if(!tmpo->next) {
-      log_fn(LOG_DEBUG,"circ (p_aci %d) not in list, probably at cpuworker.",circ->p_aci);
+      log_fn(LOG_DEBUG,"circ (p_circ_id %d) not in list, probably at cpuworker.",circ->p_circ_id);
       return;
     }
     /* now we know tmpo->next->circ == circ */
@@ -128,7 +128,7 @@ int onionskin_answer(circuit_t *circ, unsigned char *payload, unsigned char *key
 
   memset(&cell, 0, sizeof(cell_t));
   cell.command = CELL_CREATED;
-  cell.aci = circ->p_aci;
+  cell.circ_id = circ->p_circ_id;
   cell.length = DH_KEY_LEN;
 
   circ->state = CIRCUIT_STATE_OPEN;

src/or/or.h

@@ -110,9 +110,9 @@
 #define MAX_NICKNAME_LEN 32
 #define MAX_DIR_SIZE 50000 /* XXX, big enough? */
 
-#define ACI_TYPE_LOWER 0
-#define ACI_TYPE_HIGHER 1
-#define ACI_TYPE_BOTH 2
+#define CIRC_ID_TYPE_LOWER 0
+#define CIRC_ID_TYPE_HIGHER 1
+#define CIRC_ID_TYPE_BOTH 2
 
 #define _CONN_TYPE_MIN 3
 #define CONN_TYPE_OR_LISTENER 3
@@ -235,11 +235,11 @@
 
 #define SOCKS4_NETWORK_LEN 8
 
-typedef uint16_t aci_t;
+typedef uint16_t circ_id_t;
 
 /* cell definition */
 typedef struct { 
-  aci_t aci; /* Anonymous Connection Identifier */
+  circ_id_t circ_id;
   unsigned char command;
   unsigned char length; /* of payload if relay cell */
   uint32_t seq; /* sequence number */
@@ -295,8 +295,8 @@ struct connection_t {
 
 /* Used only by OR connections: */
   tor_tls *tls;
-  uint16_t next_aci; /* Which ACI do we try to use next on this connection? 
-                      * This is always in the range 0..1<<15-1.*/
+  circ_id_t next_circ_id; /* Which circ_id do we try to use next on this connection? 
+                           * This is always in the range 0..1<<15-1.*/
 
   /* bandwidth and receiver_bucket only used by ORs in OPEN state: */
   uint32_t bandwidth; /* connection bandwidth. */
@@ -404,8 +404,8 @@ struct circuit_t {
   int package_window;
   int deliver_window;
 
-  aci_t p_aci; /* circuit identifiers */
-  aci_t n_aci;
+  circ_id_t p_circ_id; /* circuit identifiers */
+  circ_id_t n_circ_id;
 
   crypto_cipher_env_t *p_crypto; /* used only for intermediate hops */
   crypto_cipher_env_t *n_crypto;
@@ -501,11 +501,11 @@ int fetch_from_buf_socks(buf_t *buf, socks_request_t *req);
 
 void circuit_add(circuit_t *circ);
 void circuit_remove(circuit_t *circ);
-circuit_t *circuit_new(aci_t p_aci, connection_t *p_conn);
+circuit_t *circuit_new(circ_id_t p_circ_id, connection_t *p_conn);
 void circuit_free(circuit_t *circ);
 
 circuit_t *circuit_enumerate_by_naddr_nport(circuit_t *start, uint32_t naddr, uint16_t nport);
-circuit_t *circuit_get_by_aci_conn(aci_t aci, connection_t *conn);
+circuit_t *circuit_get_by_circ_id_conn(circ_id_t circ_id, connection_t *conn);
 circuit_t *circuit_get_by_conn(connection_t *conn);
 circuit_t *circuit_get_newest_open(void);
 
@@ -592,7 +592,7 @@ int connection_receiver_bucket_should_increase(connection_t *conn);
 int connection_is_listener(connection_t *conn);
 int connection_state_is_open(connection_t *conn);
 
-int connection_send_destroy(aci_t aci, connection_t *conn);
+int connection_send_destroy(circ_id_t circ_id, connection_t *conn);
 
 int connection_process_inbuf(connection_t *conn);
 int connection_finished_flushing(connection_t *conn);
@@ -684,7 +684,7 @@ int main(int argc, char *argv[]);
 
 /********************************* onion.c ***************************/
 
-int decide_aci_type(char *local_nick, char *remote_nick);
+int decide_circ_id_type(char *local_nick, char *remote_nick);
 
 int onion_pending_add(circuit_t *circ);
 circuit_t *onion_next_task(void);