Clean up copyrights.

Break connection_consider_empty_buckets() out of
connection_read_bucket_decrement().


svn:r2698

28 files changed, 72 insertions, 35 deletions

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 4b6edd044e..b5c0e2f7c7 100644
--- a/src/or/buffers.c
+++ b/src/or/buffers.c
@@ -1,4 +1,6 @@
-/* Copyright 2001 Matej Pfajfar, 2001-2004 Roger Dingledine. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index 8f92ab8e59..efd7490a70 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -1,4 +1,6 @@
-/* Copyright 2001 Matej Pfajfar, 2001-2004 Roger Dingledine. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 8519ce0c0a..7b9833bd2f 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1,4 +1,6 @@
-/* Copyright 2001 Matej Pfajfar, 2001-2004 Roger Dingledine. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index 7eb3376ad8..0b5ccc9d9b 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -1,4 +1,6 @@
-/* Copyright 2001 Matej Pfajfar, 2001-2004 Roger Dingledine. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/command.c b/src/or/command.c
index 0637330be2..5cc28b8d11 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -1,4 +1,6 @@
-/* Copyright 2001 Matej Pfajfar, 2001-2004 Roger Dingledine. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/config.c b/src/or/config.c
index 335936f8f6..e8cef15bdb 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -1,4 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
@@ -625,10 +627,6 @@ option_reset(or_options_t *options, config_var_t *var)
   }
 }
 
-
-
-
-
 static void
 add_default_trusted_dirservers(void)
 {
diff --git a/src/or/connection.c b/src/or/connection.c
index e08c1d08cb..9ab7f25f02 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -1,4 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
@@ -687,6 +689,9 @@ static void connection_read_bucket_decrement(connection_t *conn, int num_read) {
   if(connection_speaks_cells(conn) && conn->state == OR_CONN_STATE_OPEN) {
     conn->receiver_bucket -= num_read; tor_assert(conn->receiver_bucket >= 0);
   }
+}
+
+static void connection_consider_empty_buckets(connection_t *conn) {
   if(global_read_bucket == 0) {
     log_fn(LOG_DEBUG,"global bucket exhausted. Pausing.");
     conn->wants_to_read = 1;
@@ -881,14 +886,13 @@ static int connection_read_to_buf(connection_t *conn) {
 
   if(result > 0 && !is_local_IP(conn->addr)) { /* remember it */
     rep_hist_note_bytes_read(result, time(NULL));
+    connection_read_bucket_decrement(conn, result);
   }
 
   /* Call even if result is 0, since the global read bucket may
    * have reached 0 on a different conn, and this guy needs to
    * know to stop reading. */
-  /* Longer-term, we should separate this out to read_bucket_decrement
-   * and consider_empty_buckets, and just call the second one always. */
-  connection_read_bucket_decrement(conn, result);
+  connection_consider_empty_buckets(conn);
 
   return 0;
 }
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index b9eaa7ddbc..e679fbf972 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1,4 +1,6 @@
-/* Copyright 2001 Matej Pfajfar, 2001-2004 Roger Dingledine. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 6b9975bae3..98dc8803bc 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -1,4 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/control.c b/src/or/control.c
index 51068e59a3..5a2f68777d 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Nick Mathewson */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c
index 84f42d06f1..dd99a98def 100644
--- a/src/or/cpuworker.c
+++ b/src/or/cpuworker.c
@@ -1,4 +1,5 @@
-/* Copyright 2003-2004 Roger Dingledine. */
+/* Copyright 2003-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/directory.c b/src/or/directory.c
index c886abd6e4..4a62335d82 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1,4 +1,7 @@
-/* Copyright 2001,2002,2003 Roger Dingledine. */
+/* Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
+/* See LICENSE for licensing information */
+
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 8e2836aab2..cfe0a46611 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/dns.c b/src/or/dns.c
index f6379ac169..7ec68846a3 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1,4 +1,5 @@
-/* Copyright 2003 Roger Dingledine. */
+/* Copyright 2003-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/hibernate.c b/src/or/hibernate.c
index 68fe34cfdb..c616066ed3 100644
--- a/src/or/hibernate.c
+++ b/src/or/hibernate.c
@@ -1,4 +1,4 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/main.c b/src/or/main.c
index 6d8f879948..29b6216bfb 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1,4 +1,6 @@
-/* Copyright 2001,2002,2003,2004 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/onion.c b/src/or/onion.c
index 9def03cd27..a4b42b2170 100644
--- a/src/or/onion.c
+++ b/src/or/onion.c
@@ -1,4 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/or.h b/src/or/or.h
index 35fb477c47..b519131248 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -1,4 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/relay.c b/src/or/relay.c
index 73c5db0f5d..e5fe9d0ebf 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1,4 +1,6 @@
-/* Copyright 2001 Matej Pfajfar, 2001-2004 Roger Dingledine. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index cd4c346dee..75d6f33189 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index b219ee2faa..1f14e3fe3e 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 4b885ae90a..457b1dcf16 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 88a2e64456..91feccfdba 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/rephist.c b/src/or/rephist.c
index dc980e9992..c49dd62e3f 100644
--- a/src/or/rephist.c
+++ b/src/or/rephist.c
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/router.c b/src/or/router.c
index f7e3eec4c4..568f7624a5 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1,4 +1,6 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index ffdeb65f65..2c4b044f8e 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -1,4 +1,6 @@
-/* Copyright 2001-2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/routerparse.c b/src/or/routerparse.c
index 2b99c72a74..4f2e473541 100644
--- a/src/or/routerparse.c
+++ b/src/or/routerparse.c
@@ -1,4 +1,6 @@
-/* Copyright 2001-2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2001 Matej Pfajfar.
+ * Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 
diff --git a/src/or/test.c b/src/or/test.c
index f627307e11..7138bb1c94 100644
--- a/src/or/test.c
+++ b/src/or/test.c
@@ -1,4 +1,5 @@
-/* Copyright 2001,2002,2003 Roger Dingledine. */
+/* Copyright 2001-2004 Roger Dingledine.
+ * Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */