[or-cvs] bugfix: now that we don"t do the client dns thing, our checks

[arma@xxxxxxxx (Roger Dingledine)]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	relay.c 
Log Message:
bugfix: now that we don't do the client dns thing, our checks
to see if somebody was contradicting his exit policy were wrong.


Index: relay.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- relay.c	11 Mar 2005 21:38:06 -0000	1.46
+++ relay.c	13 Mar 2005 05:53:17 -0000	1.47
@@ -582,6 +582,7 @@
 connection_edge_process_relay_cell_not_open(
     relay_header_t *rh, cell_t *cell, circuit_t *circ,
     connection_t *conn, crypt_path_t *layer_hint) {
+  struct in_addr in;
   uint32_t addr;
   int reason;
   routerinfo_t *exitrouter;
@@ -614,7 +615,8 @@
         log_fn(LOG_INFO,"Skipping broken circ (exit router vanished)");
         return 0; /* this circuit is screwed and doesn't know it yet */
       }
-      if (connection_ap_can_use_exit(conn, exitrouter)) {
+      if (!tor_inet_aton(conn->socks_request->address, &in) &&
+          !conn->chosen_exit_name) {
         log_fn(LOG_NOTICE,"Exitrouter '%s' seems to be more restrictive than its exit policy. Not using this router as exit for now.", exitrouter->nickname);
         addr_policy_free(exitrouter->exit_policy);
         exitrouter->exit_policy =