[or-cvs] bugfixes

[Roger Dingledine]

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

Modified Files:
	connection_edge.c onion.c or.h 
Log Message:
bugfixes


Index: connection_edge.c
===================================================================
RCS file: /home/or/cvsroot/src/or/connection_edge.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- connection_edge.c	16 Nov 2003 21:49:52 -0000	1.57
+++ connection_edge.c	16 Nov 2003 23:43:08 -0000	1.58
@@ -579,7 +579,8 @@
 
   connection_start_reading(conn);
 
-  circ->timestamp_dirty = time(NULL);
+  if(!circ->timestamp_dirty)
+    circ->timestamp_dirty = time(NULL);
 
   /* add it into the linked list of streams on this circuit */
   log_fn(LOG_DEBUG,"attaching new conn to circ. n_circ_id %d.", circ->n_circ_id);

Index: onion.c
===================================================================
RCS file: /home/or/cvsroot/src/or/onion.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -d -r1.85 -r1.86
--- onion.c	16 Nov 2003 17:00:02 -0000	1.85
+++ onion.c	16 Nov 2003 23:43:08 -0000	1.86
@@ -272,7 +272,7 @@
       ++n_best_maybe_support;
     }
   }
-  log_fn(LOG_WARN, "Found %d servers that will definitely support %d/%d pending connections, and %d that might support %d/%d.",
+  log_fn(LOG_INFO, "Found %d servers that will definitely support %d/%d pending connections, and %d that might support %d/%d.",
          n_best_support, best_support, n_pending_connections,
          n_best_maybe_support, best_maybe_support, n_pending_connections);
   if (best_support) {

Index: or.h
===================================================================
RCS file: /home/or/cvsroot/src/or/or.h,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -d -r1.188 -r1.189
--- or.h	16 Nov 2003 21:49:52 -0000	1.188
+++ or.h	16 Nov 2003 23:43:08 -0000	1.189
@@ -273,13 +273,13 @@
 
   buf_t *inbuf;
   int inbuf_reached_eof; /* did read() return 0 on this conn? */
-  long timestamp_lastread; /* when was the last time poll() said we could read? */
+  time_t timestamp_lastread; /* when was the last time poll() said we could read? */
 
   buf_t *outbuf;
   int outbuf_flushlen; /* how much data should we try to flush from the outbuf? */
-  long timestamp_lastwritten; /* when was the last time poll() said we could write? */
+  time_t timestamp_lastwritten; /* when was the last time poll() said we could write? */
 
-  long timestamp_created; /* when was this connection_t created? */
+  time_t timestamp_created; /* when was this connection_t created? */
 
   uint32_t addr; /* these two uniquely identify a router. Both in host order. */
   uint16_t port; /* if non-zero, they identify the guy on the other end
@@ -418,8 +418,8 @@
   crypt_path_t *cpath;
 
   char onionskin[DH_ONIONSKIN_LEN]; /* for storage while onionskin pending */
-  long timestamp_created;
-  long timestamp_dirty; /* when the circuit was first used, or 0 if clean */
+  time_t timestamp_created;
+  time_t timestamp_dirty; /* when the circuit was first used, or 0 if clean */
 
   uint8_t state;