diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-02-12 22:21:20 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-02-12 22:21:20 +0000 |
| commit | 7ae3f6a491c96182eab243a53a582532c415cea7 (patch) | |
| tree | b93cc080356517b1e3ab8a2c49e94b3ca67321ea | |
| parent | 3abafccd0eadb267401f20ef8c816c6e7f1c693e (diff) | |
| download | tor-7ae3f6a491c96182eab243a53a582532c415cea7.tar tor-7ae3f6a491c96182eab243a53a582532c415cea7.tar.gz | |
r18056@catbus: nickm | 2008-02-12 17:21:10 -0500
Add roger's responses from IRC to some XXX020 items.
svn:r13487
| -rw-r--r-- | src/or/circuitlist.c | 3 | ||||
| -rw-r--r-- | src/or/connection_or.c | 5 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
3 files changed, 10 insertions, 0 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 13dd97fb7..45c189b3f 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -808,6 +808,9 @@ circuit_find_to_cannibalize(uint8_t purpose, extend_info_t *info, { /*XXXX020 arma: The purpose argument is ignored. Can that possibly be * right? */ + /* XXXX <arma> i don't know of any actual bugs that this causes. since i + * think we only call the function for purposes where we want it to do what + * the function does. somebody should check this though. */ circuit_t *_circ; origin_circuit_t *best=NULL; diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 50f25e3b2..812a2d4d6 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -406,6 +406,11 @@ connection_or_init_conn_from_address(or_connection_t *conn, * its actual addr/port, we won't remember. Careful! */ /* XXXX020 arma: this is stupid, and it's the reason we need real_addr * to track is_canonical properly. What requires it? */ + /* XXXX <arma> i believe the reason we did this, originally, is because + * we wanted to log what OR a connection was to, and if we logged the + * right IP address and port 56244, that wouldn't be as helpful. now we + * log the "right" port too, so we know if it's moria1 or moria2. + */ conn->_base.addr = r->addr; conn->_base.port = r->or_port; } diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d1b0e820e..0d60a55dd 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -838,6 +838,8 @@ router_pick_directory_server(authority_type_t type, int flags) return choice; /* XXXX020 arma: what's the point of *reloading* and trying again?? -NM */ + /* XXXX020 <arma> once upon a time, reloading set the is_running back + to 1. i think. i bet it has no purpose now. */ log_info(LD_DIR,"Still no %s router entries. Reloading and trying again.", (flags & PDS_IGNORE_FASCISTFIREWALL) ? "known" : "reachable"); if (router_reload_router_list()) { |