[or-cvs] note some features we intend to add.
Roger Dingledine
arma at seul.org
Wed Apr 6 05:35:08 UTC 2005
Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or
Modified Files:
connection_or.c
Log Message:
note some features we intend to add.
Index: connection_or.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_or.c,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -d -r1.165 -r1.166
--- connection_or.c 6 Apr 2005 00:50:40 -0000 1.165
+++ connection_or.c 6 Apr 2005 05:35:06 -0000 1.166
@@ -507,6 +507,7 @@
log_fn(LOG_WARN, "Identity key not as expected for router at %s:%d: wanted %s but got %s",
conn->address, conn->port, conn->nickname, d);
control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED);
+ // XXX if we're an authdir_mode, forget about nickname's descriptor
return -1;
}
} else if (strcasecmp(conn->nickname, nickname)) {
@@ -515,8 +516,14 @@
"Other side (%s:%d) is '%s', but we tried to connect to '%s'",
conn->address, conn->port, nickname, conn->nickname);
control_event_or_conn_status(conn, OR_CONN_EVENT_FAILED);
+ // XXX if we're an authdir_mode, forget about nickname's descriptor
return -1;
}
+ if (authdir_mode(options)) {
+ /* I got exactly the guy I wanted. Now go through and blow away
+ * descriptors for exactly this Address:ORPort that aren't this guy. */
+ //XXX
+ }
} else {
if ((c=connection_get_by_identity_digest(digest_rcvd, CONN_TYPE_OR))) {
log_fn(LOG_INFO,"Router '%s' is already connected on fd %d. Dropping fd %d.", nickname, c->s, conn->s);
More information about the tor-commits
mailing list