diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-11-16 23:43:08 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-11-16 23:43:08 +0000 |
| commit | 5e81e4748e8a631822684362b0c3ea40c492061b (patch) | |
| tree | e6a53b8e7f8f0b01bd8ee6753f8cd0d050cc333f | |
| parent | 6d0e611fde9d8610a0e3837da17545f8f42e1adc (diff) | |
| download | tor-5e81e4748e8a631822684362b0c3ea40c492061b.tar.gz tor-5e81e4748e8a631822684362b0c3ea40c492061b.zip | |
bugfixes
svn:r818
| -rw-r--r-- | src/or/connection_edge.c | 3 | ||||
| -rw-r--r-- | src/or/onion.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 10 |
3 files changed, 8 insertions, 7 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 32fa77eddf..849d4afe69 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -579,7 +579,8 @@ static int connection_ap_handshake_attach_circuit(connection_t *conn) { 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); diff --git a/src/or/onion.c b/src/or/onion.c index 0024e1c37c..5ef2023d60 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -272,7 +272,7 @@ static routerinfo_t *choose_good_exit_server(directory_t *dir) ++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) { diff --git a/src/or/or.h b/src/or/or.h index 44888f9fac..b2b4617a1b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -273,13 +273,13 @@ struct connection_t { 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 @@ struct circuit_t { 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; |