simplify when we're picking a default address for

when people ask for "serifos.exit".


svn:r6187
This commit is contained in:
Roger Dingledine
2006-03-18 22:54:08 +00:00
parent 868d456c3b
commit 7e2aa67fcb
+1 -4
View File
@@ -995,15 +995,12 @@ connection_ap_handshake_rewrite_and_attach(connection_t *conn,
return -1;
}
} else {
struct in_addr in;
routerinfo_t *r;
conn->chosen_exit_name = tor_strdup(socks->address);
r = router_get_by_nickname(conn->chosen_exit_name, 1);
*socks->address = 0;
if (r) {
/* XXXX Should this use server->address instead? */
in.s_addr = htonl(r->addr);
strlcpy(socks->address, inet_ntoa(in), sizeof(socks->address));
strlcpy(socks->address, r->address, sizeof(socks->address));
} else {
log_warn(LD_APP,
"Unrecognized server in exit address '%s.exit'. Refusing.",