[or-cvs] Split out mark_for_close with circuits. Seems to work for ...
Nick Mathewson
nickm at seul.org
Tue Mar 2 17:48:19 UTC 2004
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/tmp/cvs-serv5508/or
Modified Files:
circuit.c command.c connection_edge.c cpuworker.c main.c or.h
Log Message:
Split out mark_for_close with circuits. Seems to work for me.
Index: circuit.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuit.c,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -d -r1.144 -r1.145
--- circuit.c 29 Feb 2004 03:52:38 -0000 1.144
+++ circuit.c 2 Mar 2004 17:48:16 -0000 1.145
@@ -18,7 +18,6 @@
/********* START VARIABLES **********/
static circuit_t *global_circuitlist=NULL;
-
char *circuit_state_to_string[] = {
"doing handshakes", /* 0 */
"processing the onion", /* 1 */
@@ -56,6 +55,26 @@
}
}
+void circuit_close_all_marked()
+{
+ circuit_t *tmp,*m;
+
+ while (global_circuitlist && global_circuitlist->marked_for_close) {
+ tmp = global_circuitlist->next;
+ circuit_free(global_circuitlist);
+ global_circuitlist = tmp;
+ }
+
+ for (tmp = global_circuitlist; tmp->next; tmp=tmp->next) {
+ while (tmp->next->marked_for_close) {
+ m = tmp->next->next;
+ circuit_free(tmp->next);
+ tmp->next = m;
+ }
+ }
+}
+
+
circuit_t *circuit_new(uint16_t p_circ_id, connection_t *p_conn) {
circuit_t *circ;
@@ -166,6 +185,9 @@
connection_t *tmpconn;
for(circ=global_circuitlist;circ;circ = circ->next) {
+ if (circ->marked_for_close)
+ continue;
+
if(circ->p_circ_id == circ_id) {
if(circ->p_conn == conn)
return circ;
@@ -191,6 +213,9 @@
connection_t *tmpconn;
for(circ=global_circuitlist;circ;circ = circ->next) {
+ if (circ->marked_for_close)
+ continue;
+
if(circ->p_conn == conn)
return circ;
if(circ->n_conn == conn)
@@ -220,6 +245,8 @@
continue; /* this circ doesn't start at us */
if(must_be_open && (circ->state != CIRCUIT_STATE_OPEN || !circ->n_conn))
continue; /* ignore non-open circs */
+ if (circ->marked_for_close)
+ continue;
if(conn) {
if(circ->state == CIRCUIT_STATE_OPEN && circ->n_conn) /* open */
exitrouter = router_get_by_addr_port(circ->cpath->prev->addr, circ->cpath->prev->port);
@@ -270,7 +297,8 @@
circ = circ->next;
if(victim->cpath &&
victim->state != CIRCUIT_STATE_OPEN &&
- victim->timestamp_created + MIN_SECONDS_BEFORE_EXPIRING_CIRC+1 < now) {
+ victim->timestamp_created + MIN_SECONDS_BEFORE_EXPIRING_CIRC+1 < now &&
+ !victim->marked_for_close) {
if(victim->n_conn)
log_fn(LOG_INFO,"Abandoning circ %s:%d:%d (state %d:%s)",
victim->n_conn->address, victim->n_port, victim->n_circ_id,
@@ -279,7 +307,7 @@
log_fn(LOG_INFO,"Abandoning circ %d (state %d:%s)", victim->n_circ_id,
victim->state, circuit_state_to_string[victim->state]);
circuit_log_path(LOG_INFO,victim);
- circuit_close(victim);
+ circuit_mark_for_close(victim);
}
}
}
@@ -290,7 +318,9 @@
int num=0;
for(circ=global_circuitlist;circ;circ = circ->next) {
- if(circ->cpath && circ->state != CIRCUIT_STATE_OPEN)
+ if(circ->cpath
+ && circ->state != CIRCUIT_STATE_OPEN
+ && !circ->marked_for_close)
num++;
}
return num;
@@ -306,7 +336,8 @@
int num=0;
for(circ=global_circuitlist;circ;circ = circ->next) {
- if(circ->cpath && circ->state != CIRCUIT_STATE_OPEN) {
+ if(circ->cpath && circ->state != CIRCUIT_STATE_OPEN &&
+ !circ->marked_for_close) {
exitrouter = router_get_by_nickname(circ->build_state->chosen_exit);
if(exitrouter && connection_ap_can_use_exit(conn, exitrouter) != ADDR_POLICY_REJECTED)
if(++num >= MIN_CIRCUITS_HANDLING_STREAM)
@@ -401,6 +432,8 @@
assert(cell && circ);
assert(cell_direction == CELL_DIRECTION_OUT || cell_direction == CELL_DIRECTION_IN);
+ if (circ->marked_for_close)
+ return 0;
if(relay_crypt(circ, cell, cell_direction, &layer_hint, &recognized) < 0) {
log_fn(LOG_WARN,"relay crypt failed. Dropping connection.");
@@ -649,11 +682,13 @@
}
}
-void circuit_close(circuit_t *circ) {
+int _circuit_mark_for_close(circuit_t *circ) {
connection_t *conn;
- assert(circ);
- circuit_remove(circ);
+ assert_circuit_ok(circ);
+ if (circ->marked_for_close < 0)
+ return -1;
+
if(circ->state == CIRCUIT_STATE_ONIONSKIN_PENDING) {
onion_pending_remove(circ);
}
@@ -675,7 +710,9 @@
* circuit-building failed immediately, it won't be set yet. */
circuit_increment_failure_count();
}
- circuit_free(circ);
+
+ circ->marked_for_close = 1;
+ return 0;
}
void circuit_detach_stream(circuit_t *circ, connection_t *conn) {
@@ -721,7 +758,7 @@
circ->n_conn = NULL;
if(circ->p_conn == conn) /* it's closing behind us */
circ->p_conn = NULL;
- circuit_close(circ);
+ circuit_mark_for_close(circ);
}
return;
case CONN_TYPE_AP:
@@ -826,9 +863,9 @@
circ = circ->next;
if(tmpcirc->timestamp_dirty &&
tmpcirc->timestamp_dirty + options.NewCircuitPeriod < now &&
- !tmpcirc->p_conn && !tmpcirc->p_streams) {
+ !tmpcirc->p_conn && !tmpcirc->p_streams && !tmpcirc->marked_for_close) {
log_fn(LOG_DEBUG,"Closing n_circ_id %d",tmpcirc->n_circ_id);
- circuit_close(tmpcirc);
+ circuit_mark_for_close(tmpcirc);
}
}
}
@@ -849,7 +886,7 @@
return -1;
}
- /* try a circ. if it fails, circuit_close will increment n_circuit_failures */
+ /* try a circ. if it fails, circuit_mark_for_close will increment n_circuit_failures */
circuit_establish_circuit();
return 0;
@@ -875,14 +912,14 @@
if (! circ->build_state) {
log_fn(LOG_INFO,"Generating cpath length failed.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return -1;
}
onion_extend_cpath(&circ->cpath, circ->build_state, &firsthop);
if(!circ->cpath) {
log_fn(LOG_INFO,"Generating first cpath hop failed.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return -1;
}
@@ -896,7 +933,7 @@
circ->n_port = firsthop->or_port;
if(options.ORPort) { /* we would be connected if he were up. and he's not. */
log_fn(LOG_INFO,"Route's firsthop isn't connected.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return -1;
}
@@ -904,7 +941,7 @@
n_conn = connection_or_connect(firsthop);
if(!n_conn) { /* connect failed, forget the whole thing */
log_fn(LOG_INFO,"connect to firsthop failed. Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return -1;
}
}
@@ -920,7 +957,7 @@
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.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return -1;
}
}
@@ -932,13 +969,15 @@
circuit_t *circ;
for(circ=global_circuitlist;circ;circ = circ->next) {
+ if (circ->marked_for_close)
+ continue;
if(circ->cpath && circ->n_addr == or_conn->addr && circ->n_port == or_conn->port) {
assert(circ->state == CIRCUIT_STATE_OR_WAIT);
log_fn(LOG_DEBUG,"Found circ %d, sending onion skin.", circ->n_circ_id);
circ->n_conn = or_conn;
if(circuit_send_next_onion_skin(circ) < 0) {
log_fn(LOG_INFO,"send_next_onion_skin failed; circuit marked for closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
continue;
/* XXX could this be bad, eg if next_onion_skin failed because conn died? */
}
@@ -1149,7 +1188,7 @@
* means that a connection broke or an extend failed. For now,
* just give up.
*/
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return 0;
while(layer->next != circ->cpath) {
@@ -1223,6 +1262,9 @@
assert(c);
assert(c->magic == CIRCUIT_MAGIC);
+
+ return 0; /* XXX fix the rest of this. */
+
assert(c->n_addr);
assert(c->n_port);
assert(c->n_conn);
Index: command.c
===================================================================
RCS file: /home/or/cvsroot/src/or/command.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- command.c 28 Feb 2004 07:01:22 -0000 1.53
+++ command.c 2 Mar 2004 17:48:16 -0000 1.54
@@ -109,7 +109,7 @@
/* hand it off to the cpuworkers, and then return */
if(assign_to_cpuworker(NULL, CPUWORKER_TASK_ONION, circ) < 0) {
log_fn(LOG_WARN,"Failed to hand off onionskin. Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return;
}
log_fn(LOG_DEBUG,"success: handed off onionskin.");
@@ -127,7 +127,7 @@
if(circ->n_circ_id != cell->circ_id) {
log_fn(LOG_WARN,"got created cell from OPward? Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return;
}
@@ -135,13 +135,13 @@
log_fn(LOG_DEBUG,"at OP. Finishing handshake.");
if(circuit_finish_handshake(circ, cell->payload) < 0) {
log_fn(LOG_WARN,"circuit_finish_handshake failed.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return;
}
log_fn(LOG_DEBUG,"Moving to next skin.");
if(circuit_send_next_onion_skin(circ) < 0) {
log_fn(LOG_INFO,"circuit_send_next_onion_skin failed.");
- circuit_close(circ); /* XXX push this circuit_close lower */
+ circuit_mark_for_close(circ); /* XXX push this circuit_close lower */
return;
}
} else { /* pack it into an extended relay cell, and send it. */
@@ -163,20 +163,20 @@
if(circ->state == CIRCUIT_STATE_ONIONSKIN_PENDING) {
log_fn(LOG_WARN,"circuit in create_wait. Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return;
}
if(cell->circ_id == circ->p_circ_id) { /* it's an outgoing cell */
if(circuit_receive_relay_cell(cell, circ, CELL_DIRECTION_OUT) < 0) {
log_fn(LOG_WARN,"circuit_receive_relay_cell (forward) failed. Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return;
}
} else { /* it's an ingoing cell */
if(circuit_receive_relay_cell(cell, circ, CELL_DIRECTION_IN) < 0) {
log_fn(LOG_WARN,"circuit_receive_relay_cell (backward) failed. Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return;
}
}
@@ -200,7 +200,7 @@
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);
+ circuit_mark_for_close(circ);
} else { /* the destroy came from ahead */
circ->n_conn = NULL;
log_fn(LOG_DEBUG, "Delivering 'truncated' back.");
Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- connection_edge.c 2 Mar 2004 07:24:11 -0000 1.107
+++ connection_edge.c 2 Mar 2004 17:48:16 -0000 1.108
@@ -187,7 +187,7 @@
if(circuit_package_relay_cell(&cell, circ, cell_direction, cpath_layer) < 0) {
log_fn(LOG_WARN,"circuit_package_relay_cell failed. Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
return -1;
}
return 0;
Index: cpuworker.c
===================================================================
RCS file: /home/or/cvsroot/src/or/cpuworker.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- cpuworker.c 28 Feb 2004 04:11:53 -0000 1.22
+++ cpuworker.c 2 Mar 2004 17:48:16 -0000 1.23
@@ -93,12 +93,12 @@
assert(circ->p_conn);
if(*buf == 0) {
log_fn(LOG_WARN,"decoding onionskin failed. Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
goto done_processing;
}
if(onionskin_answer(circ, buf+1+TAG_LEN, buf+1+TAG_LEN+ONIONSKIN_REPLY_LEN) < 0) {
log_fn(LOG_WARN,"onionskin_answer failed. Closing.");
- circuit_close(circ);
+ circuit_mark_for_close(circ);
goto done_processing;
}
log_fn(LOG_DEBUG,"onionskin_answer succeeded. Yay.");
Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.183
retrieving revision 1.184
diff -u -d -r1.183 -r1.184
--- main.c 29 Feb 2004 22:34:38 -0000 1.183
+++ main.c 2 Mar 2004 17:48:16 -0000 1.184
@@ -387,7 +387,10 @@
run_connection_housekeeping(i, now);
}
- /* 6. and blow away any connections that need to die. can't do this later
+ /* 6. And remove any marked circuits... */
+ circuit_close_all_marked();
+
+ /* 7. and blow away any connections that need to die. can't do this later
* because we might open up a circuit and not realize we're about to cull
* the connection it's running over.
* XXX we can remove this step once we audit circuit-building to make sure
Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.239
retrieving revision 1.240
diff -u -d -r1.239 -r1.240
--- or.h 2 Mar 2004 07:24:11 -0000 1.239
+++ or.h 2 Mar 2004 17:48:17 -0000 1.240
@@ -458,6 +458,7 @@
int marked_for_close; /* Should we close this circuit at the end of the main
* loop? */
+ char *marked_for_close_file;
uint32_t n_addr;
uint16_t n_port;
@@ -487,7 +488,7 @@
uint8_t state;
- void *next;
+ struct circuit_t *next;
};
typedef struct circuit_t circuit_t;
@@ -575,8 +576,22 @@
void circuit_add(circuit_t *circ);
void circuit_remove(circuit_t *circ);
circuit_t *circuit_new(uint16_t p_circ_id, connection_t *p_conn);
+void circuit_close_all_marked(void);
void circuit_free(circuit_t *circ);
void circuit_free_cpath(crypt_path_t *cpath);
+int _circuit_mark_for_close(circuit_t *circ);
+
+#define circuit_mark_for_close(c) \
+ do { \
+ if (_circuit_mark_for_close(c)<0) { \
+ log(LOG_WARN,"Duplicate call to circuit_mark_for_close at %s:%d (first at %s:%d)", \
+ __FILE__,__LINE__,c->marked_for_close_file,c->marked_for_close); \
+ } else { \
+ c->marked_for_close_file = __FILE__; \
+ c->marked_for_close = __LINE__; \
+ } \
+ } while (0)
+
circuit_t *circuit_get_by_circ_id_conn(uint16_t circ_id, connection_t *conn);
circuit_t *circuit_get_by_conn(connection_t *conn);
@@ -595,7 +610,6 @@
int circuit_consider_stop_edge_reading(circuit_t *circ, int edge_type, crypt_path_t *layer_hint);
void circuit_consider_sending_sendme(circuit_t *circ, int edge_type, crypt_path_t *layer_hint);
-void circuit_close(circuit_t *circ);
void circuit_detach_stream(circuit_t *circ, connection_t *conn);
void circuit_about_to_close_connection(connection_t *conn);
More information about the tor-commits
mailing list