[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] remove some more dead code (found while hunting lasse"s bug)
Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or
Modified Files:
circuitbuild.c
Log Message:
remove some more dead code (found while hunting lasse's bug)
Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- circuitbuild.c 19 Nov 2005 06:57:44 -0000 1.160
+++ circuitbuild.c 24 Nov 2005 06:06:50 -0000 1.161
@@ -1491,7 +1491,6 @@
int cur_len;
crypt_path_t *cpath;
extend_info_t *info = NULL;
- smartlist_t *excludednodes;
tor_assert(head_ptr);
@@ -1513,9 +1512,6 @@
debug(LD_CIRC, "Path is %d long; we want %d", cur_len,
state->desired_path_len);
- excludednodes = smartlist_create();
- add_nickname_list_to_smartlist(excludednodes,get_options()->ExcludeNodes,0,1);
-
if (cur_len == state->desired_path_len - 1) { /* Picking last node */
info = extend_info_dup(state->chosen_exit);
} else if (cur_len == 0) { /* picking first node */
@@ -1529,7 +1525,6 @@
info = extend_info_from_router(r);
}
- smartlist_free(excludednodes);
if (!info) {
warn(LD_CIRC,"Failed to find node for hop %d of our path. Discarding this circuit.", cur_len);
return -1;