Clean up copyrights.

Break connection_consider_empty_buckets() out of
connection_read_bucket_decrement().

svn:r2698

diff --git a/src/or/buffers.c b/src/or/buffers.c
index 4b6edd044ea8bc33b737741ee961bbbe77ad73bf..b5c0e2f7c7cd57ec0b14737e036fddd083fae314 100644 (file)
--- 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 8f92ab8e59eb29facb8401441386b2d621f175de..efd7490a7082eee2fd5a2306bda27407994dfa44 100644 (file)
--- 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 8519ce0c0a84982e65bc2405deeea39e8e2b11d4..7b9833bd2f3897180b034d664b4351bfe03776f7 100644 (file)
--- 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 7eb3376ad8d29801f755e4416889f591686e5a7c..0b5ccc9d9b0539a807772ff8542cbaeae0bc2e94 100644 (file)
--- 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 0637330be2dc62d6d688322a636ef28a43cf52ea..5cc28b8d118903b5247f4473ecde85368b445359 100644 (file)
--- 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 335936f8f601418b28c482f43629dc69b310e9f1..e8cef15bdbe0fdf2ccd0f57d69ed0022a2bf573a 100644 (file)
--- 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 e08c1d08cbfddabc53ab03cb3955ce1dddc3d727..9ab7f25f02a0db55a97e90fe9a56d549a0c35013 100644 (file)
--- 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 b9eaa7ddbc5890f812e1d0bc724f72984393d78a..e679fbf9728ca2c494d73fdf2fc5a2a9df557b08 100644 (file)
--- 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 6b9975bae3662ecf1d025af331fab435d624ec9a..98dc8803bc93515d67b2a3ff8826ff1b300b1b98 100644 (file)
--- 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 51068e59a37c9c42b0e8f1a6dc94e50d762d5672..5a2f68777def8186d543b3f6ca832b7f760002bb 100644 (file)
--- 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 84f42d06f19a7b51a6fbb413fffa1bde61a1a7a5..dd99a98defc25dfd28c76efa7f0b7b226075f299 100644 (file)
--- 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 c886abd6e44dbc634610f5430e4306b3b35f8662..4a62335d824f660a6faca1b11e13d4b8aa72bc47 100644 (file)
--- 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 8e2836aab2e1eaf5fb3fd6d09f0aa4644432ba1a..cfe0a46611d6478872521a8e5e4954660c067d4e 100644 (file)
--- 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 f6379ac16938bcbeca1d798f6deda20e58db8326..7ec68846a3db6fe8f7fd4db066d06441679d6ac7 100644 (file)
--- 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 68fe34cfdbd538b78da38716ce9e91138d641ac2..c616066ed388ecf779303960609a15c9342bfafe 100644 (file)
--- 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 6d8f879948f0e27a5441a53b36d69902c7c7e08d..29b6216bfbff039b31193728777d25e613228595 100644 (file)
--- 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 9def03cd271df3d2f3f138df3ad86641d5932c43..a4b42b2170d564e28dcda3c537392ab0b6f4bb45 100644 (file)
--- 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 35fb477c47bc742e7e9bbdab34fd563b21e4a595..b519131248b83a9c0957e14d5e39aa4c7d1ba5ae 100644 (file)
--- 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 73c5db0f5d34617f5a84ff3834841225130745e0..e5fe9d0ebfbef6e8132f40832cdd0ccc532d96d3 100644 (file)
--- 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 cd4c346dee3651d3a6958b1a2a914fa65d37dbf5..75d6f331898c4b37bb473943c3e7be8c3c364faa 100644 (file)
--- 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 b219ee2faa8a489a91559fb82c11ab745ac5e0c3..1f14e3fe3e81f6ce8ae71632fa25c78c525e6e71 100644 (file)
--- 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 4b885ae90a70f04667adbf3e9041b71ab46767c7..457b1dcf160d42f7788c7f74777222a752f0bd81 100644 (file)
--- 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 88a2e644564ab66e18f451c168ef0a17fa84e58b..91feccfdbaf8fc3d7891ce6032f79ca4ab2f1783 100644 (file)
--- 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 dc980e9992ead36c4c33bb06ffdbec94a2d43a00..c49dd62e3f57ca833e63dba3360cbc9ba6ffee94 100644 (file)
--- 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 f7e3eec4c40122ae81068ba82e0191aa28b0a1f4..568f7624a5f4e684ab409cf6ee1dadc6e156ae68 100644 (file)
--- 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 ffdeb65f65887a9d7b1d20123ddac04f61ef62af..2c4b044f8ec101185879e0568eb82b7ebc20dca4 100644 (file)
--- 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 2b99c72a7449f46cef9178c2c64592f6b5ddca61..4f2e473541c27e11baea17c7672b5b4f4a5d9bfa 100644 (file)
--- 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 f627307e11b23fca93f80100175340980b3d5db4..7138bb1c942b741853db24194a484e31d0d63f88 100644 (file)
--- 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$ */