[or-cvs] forward-port the 0.1.0.11 stuff

[arma@xxxxxxxx]

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

Modified Files:
	connection_edge.c router.c 
Log Message:
forward-port the 0.1.0.11 stuff


Index: connection_edge.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/connection_edge.c,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -d -r1.335 -r1.336
--- connection_edge.c	30 Jun 2005 07:17:38 -0000	1.335
+++ connection_edge.c	1 Jul 2005 02:01:21 -0000	1.336
@@ -1553,7 +1553,7 @@
   uint16_t port;
 
   if (!connection_edge_is_rendezvous_stream(conn) &&
-      router_compare_to_my_exit_policy(conn) == ADDR_POLICY_REJECTED) {
+      router_compare_to_my_exit_policy(conn)) {
     log_fn(LOG_INFO,"%s:%d failed exit policy. Closing.",
            safe_str(conn->address), conn->port);
     connection_edge_end(conn, END_STREAM_REASON_EXITPOLICY, conn->cpath_layer);

Index: router.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/router.c,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -d -r1.181 -r1.182
--- router.c	11 Jun 2005 18:52:11 -0000	1.181
+++ router.c	1 Jul 2005 02:01:21 -0000	1.182
@@ -640,7 +640,7 @@
 }
 
 /** OR only: Check whether my exit policy says to allow connection to
- * conn.  Return false if we accept; true if we reject.
+ * conn.  Return 0 if we accept; non-0 if we reject.
  */
 int
 router_compare_to_my_exit_policy(connection_t *conn)