[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[or-cvs] Clean up copyrights.

To: or-cvs@freehaven.net
Subject: [or-cvs] Clean up copyrights.
From: arma@seul.org (Roger Dingledine)
Date: Sat, 6 Nov 2004 20:33:09 -0500 (EST)
Delivered-to: archiver@seul.org
Delivered-to: or-cvs-outgoing@seul.org
Delivered-to: or-cvs@seul.org
Delivery-date: Sat, 06 Nov 2004 20:33:32 -0500
Reply-to: or-dev@freehaven.net
Sender: owner-or-cvs@freehaven.net
Update of /home/or/cvsroot/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/src/or

Modified Files:
	buffers.c circuitbuild.c circuitlist.c circuituse.c command.c 
	config.c connection.c connection_edge.c connection_or.c 
	control.c cpuworker.c directory.c dirserv.c dns.c hibernate.c 
	main.c onion.c or.h relay.c rendclient.c rendcommon.c 
	rendmid.c rendservice.c rephist.c router.c routerlist.c 
	routerparse.c test.c 
Log Message:
Clean up copyrights.
Break connection_consider_empty_buckets() out of
connection_read_bucket_decrement().


Index: buffers.c
===================================================================
RCS file: /home/or/cvsroot/src/or/buffers.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- buffers.c	4 Nov 2004 22:30:49 -0000	1.111
+++ buffers.c	7 Nov 2004 01:33:05 -0000	1.112
@@ -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$ */
 

Index: circuitbuild.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuitbuild.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- circuitbuild.c	6 Nov 2004 05:18:10 -0000	1.51
+++ circuitbuild.c	7 Nov 2004 01:33:05 -0000	1.52
@@ -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$ */
 

Index: circuitlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuitlist.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- circuitlist.c	6 Nov 2004 05:18:10 -0000	1.16
+++ circuitlist.c	7 Nov 2004 01:33:05 -0000	1.17
@@ -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$ */
 

Index: circuituse.c
===================================================================
RCS file: /home/or/cvsroot/src/or/circuituse.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- circuituse.c	6 Nov 2004 05:18:10 -0000	1.21
+++ circuituse.c	7 Nov 2004 01:33:05 -0000	1.22
@@ -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$ */
 

Index: command.c
===================================================================
RCS file: /home/or/cvsroot/src/or/command.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- command.c	6 Nov 2004 05:18:10 -0000	1.70
+++ command.c	7 Nov 2004 01:33:05 -0000	1.71
@@ -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$ */
 

Index: config.c
===================================================================
RCS file: /home/or/cvsroot/src/or/config.c,v
retrieving revision 1.212
retrieving revision 1.213
diff -u -d -r1.212 -r1.213
--- config.c	6 Nov 2004 08:55:22 -0000	1.212
+++ config.c	7 Nov 2004 01:33:05 -0000	1.213
@@ -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 @@
   }
 }
 
-
-
-
-
 static void
 add_default_trusted_dirservers(void)
 {

Index: connection.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection.c,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -d -r1.283 -r1.284
--- connection.c	6 Nov 2004 05:18:11 -0000	1.283
+++ connection.c	7 Nov 2004 01:33:05 -0000	1.284
@@ -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 @@
   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 @@
 
   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;
 }

Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- connection_edge.c	6 Nov 2004 05:18:11 -0000	1.225
+++ connection_edge.c	7 Nov 2004 01:33:05 -0000	1.226
@@ -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$ */
 

Index: connection_or.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_or.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -d -r1.134 -r1.135
--- connection_or.c	6 Nov 2004 05:18:11 -0000	1.134
+++ connection_or.c	7 Nov 2004 01:33:06 -0000	1.135
@@ -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$ */
 

Index: control.c
===================================================================
RCS file: /home/or/cvsroot/src/or/control.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- control.c	6 Nov 2004 05:18:11 -0000	1.7
+++ control.c	7 Nov 2004 01:33:06 -0000	1.8
@@ -1,4 +1,4 @@
-/* Copyright 2004 Nick Mathewson */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

Index: cpuworker.c
===================================================================
RCS file: /home/or/cvsroot/src/or/cpuworker.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- cpuworker.c	6 Nov 2004 05:18:11 -0000	1.52
+++ cpuworker.c	7 Nov 2004 01:33:06 -0000	1.53
@@ -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$ */
 

Index: directory.c
===================================================================
RCS file: /home/or/cvsroot/src/or/directory.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- directory.c	6 Nov 2004 05:18:11 -0000	1.160
+++ directory.c	7 Nov 2004 01:33:06 -0000	1.161
@@ -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$ */
 

Index: dirserv.c
===================================================================
RCS file: /home/or/cvsroot/src/or/dirserv.c,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -d -r1.111 -r1.112
--- dirserv.c	6 Nov 2004 05:18:11 -0000	1.111
+++ dirserv.c	7 Nov 2004 01:33:06 -0000	1.112
@@ -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$ */
 

Index: dns.c
===================================================================
RCS file: /home/or/cvsroot/src/or/dns.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- dns.c	6 Nov 2004 05:18:11 -0000	1.117
+++ dns.c	7 Nov 2004 01:33:06 -0000	1.118
@@ -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$ */
 

Index: hibernate.c
===================================================================
RCS file: /home/or/cvsroot/src/or/hibernate.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- hibernate.c	6 Nov 2004 06:56:28 -0000	1.7
+++ hibernate.c	7 Nov 2004 01:33:06 -0000	1.8
@@ -1,4 +1,4 @@
-/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

Index: main.c
===================================================================
RCS file: /home/or/cvsroot/src/or/main.c,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -d -r1.357 -r1.358
--- main.c	6 Nov 2004 09:22:08 -0000	1.357
+++ main.c	7 Nov 2004 01:33:06 -0000	1.358
@@ -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$ */
 

Index: onion.c
===================================================================
RCS file: /home/or/cvsroot/src/or/onion.c,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -d -r1.168 -r1.169
--- onion.c	6 Nov 2004 05:18:11 -0000	1.168
+++ onion.c	7 Nov 2004 01:33:06 -0000	1.169
@@ -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$ */
 

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.464
retrieving revision 1.465
diff -u -d -r1.464 -r1.465
--- or.h	6 Nov 2004 05:18:11 -0000	1.464
+++ or.h	7 Nov 2004 01:33:06 -0000	1.465
@@ -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$ */
 

Index: relay.c
===================================================================
RCS file: /home/or/cvsroot/src/or/relay.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- relay.c	6 Nov 2004 05:18:11 -0000	1.17
+++ relay.c	7 Nov 2004 01:33:06 -0000	1.18
@@ -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$ */
 

Index: rendclient.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendclient.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -d -r1.60 -r1.61
--- rendclient.c	2 Nov 2004 02:28:51 -0000	1.60
+++ rendclient.c	7 Nov 2004 01:33:06 -0000	1.61
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

Index: rendcommon.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendcommon.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- rendcommon.c	2 Nov 2004 02:28:51 -0000	1.38
+++ rendcommon.c	7 Nov 2004 01:33:06 -0000	1.39
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

Index: rendmid.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendmid.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- rendmid.c	2 Nov 2004 02:28:51 -0000	1.29
+++ rendmid.c	7 Nov 2004 01:33:06 -0000	1.30
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

Index: rendservice.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rendservice.c,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -d -r1.101 -r1.102
--- rendservice.c	6 Nov 2004 05:18:11 -0000	1.101
+++ rendservice.c	7 Nov 2004 01:33:06 -0000	1.102
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

Index: rephist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/rephist.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- rephist.c	27 Oct 2004 21:54:44 -0000	1.36
+++ rephist.c	7 Nov 2004 01:33:06 -0000	1.37
@@ -1,4 +1,4 @@
-/* Copyright 2004 Roger Dingledine */
+/* Copyright 2004 Roger Dingledine, Nick Mathewson. */
 /* See LICENSE for licensing information */
 /* $Id$ */
 

Index: router.c
===================================================================
RCS file: /home/or/cvsroot/src/or/router.c,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -d -r1.110 -r1.111
--- router.c	6 Nov 2004 05:18:11 -0000	1.110
+++ router.c	7 Nov 2004 01:33:06 -0000	1.111
@@ -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$ */
 

Index: routerlist.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerlist.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -d -r1.177 -r1.178
--- routerlist.c	6 Nov 2004 05:18:11 -0000	1.177
+++ routerlist.c	7 Nov 2004 01:33:06 -0000	1.178
@@ -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$ */
 

Index: routerparse.c
===================================================================
RCS file: /home/or/cvsroot/src/or/routerparse.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- routerparse.c	6 Nov 2004 05:18:11 -0000	1.71
+++ routerparse.c	7 Nov 2004 01:33:06 -0000	1.72
@@ -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$ */
 

Index: test.c
===================================================================
RCS file: /home/or/cvsroot/src/or/test.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -d -r1.141 -r1.142
--- test.c	6 Nov 2004 05:18:11 -0000	1.141
+++ test.c	7 Nov 2004 01:33:06 -0000	1.142
@@ -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$ */
Prev by Author: [or-cvs] tor --list-fingerprint as a client shouldn"t try to print n...
Next by Author: [or-cvs] allow unauth control connections for now
Previous by thread: [or-cvs] tor --list-fingerprint as a client shouldn"t try to print n...
Next by thread: [or-cvs] allow unauth control connections for now
Index(es):
- Author
- Thread