[or-cvs] r9369: man, i could have sworn that compiled (tor/trunk/src/or)

[arma at seul.org]

Author: arma
Date: 2007-01-17 22:42:45 -0500 (Wed, 17 Jan 2007)
New Revision: 9369

Modified:
   tor/trunk/src/or/connection.c
Log:
man, i could have sworn that compiled


Modified: tor/trunk/src/or/connection.c
===================================================================
--- tor/trunk/src/or/connection.c	2007-01-18 03:38:24 UTC (rev 9368)
+++ tor/trunk/src/or/connection.c	2007-01-18 03:42:45 UTC (rev 9369)
@@ -1150,9 +1150,9 @@
     or_connection_t *or_conn = TO_OR_CONN(conn);
     conn_bucket = or_conn->read_bucket;
   }
-  if (conn_is_internal(conn->addr, 0)) {
+  if (is_internal_IP(conn->addr, 0)) {
     /* be willing to read on local conns even if our buckets are empty */
-    return conn_bucket>=0 ? conn_bucket : 2**14;
+    return conn_bucket>=0 ? conn_bucket : 1<<14;
   }
   return connection_bucket_round_robin(base, priority,
                                        global_read_bucket, conn_bucket);
@@ -1166,7 +1166,7 @@
                CELL_NETWORK_SIZE : RELAY_PAYLOAD_SIZE;
   int priority = conn->type != CONN_TYPE_DIR;
 
-  if (conn_is_internal(conn->addr, 0)) {
+  if (is_internal_IP(conn->addr, 0)) {
     /* be willing to write to local conns even if our buckets are empty */
     return conn->outbuf_flushlen;
   }