diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-10-08 04:10:59 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-10-08 04:10:59 +0000 |
| commit | 8b80362c76861b046105189a6d2613821b690906 (patch) | |
| tree | 069baca19c1868ecf9de56c1ce9af2287c0c8901 | |
| parent | 99df8ea487dd62fc361507b96f49204be4c9e5de (diff) | |
| download | tor-8b80362c76861b046105189a6d2613821b690906.tar.gz tor-8b80362c76861b046105189a6d2613821b690906.zip | |
0.0.2pre11, new license
svn:r564
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | doc/TODO | 1 | ||||
| -rw-r--r-- | src/or/config.c | 1 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 2 | ||||
| -rw-r--r-- | src/or/connection_or.c | 2 | ||||
| -rw-r--r-- | src/or/or.h | 2 |
6 files changed, 6 insertions, 4 deletions
diff --git a/configure.in b/configure.in index bac5ced84d..0adac82479 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ AC_INIT -AM_INIT_AUTOMAKE(tor, 0.0.2pre10) +AM_INIT_AUTOMAKE(tor, 0.0.2pre11) AM_CONFIG_HEADER(orconfig.h) CFLAGS="-Wall -O2 -I/usr/kerberos/include" @@ -1,4 +1,5 @@ +let hup reread the config file, eg so we can get new exit policies without restarting use times(2) rather than gettimeofday to measure how long it takes to process a cell Legend: diff --git a/src/or/config.c b/src/or/config.c index 3314e2c701..d2b61a5c41 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -199,6 +199,7 @@ int getconfig(int argc, char **argv, or_options_t *options) { /* give reasonable values for each option. Defaults to zero. */ memset(options,0,sizeof(or_options_t)); options->LogLevel = "info"; + options->ExitPolicy = "reject 127.0.0.1:*,reject 18.244.0.188:25,accept *:*"; options->loglevel = LOG_DEBUG; options->DataDirectory = NULL; options->CoinWeight = 0.1; diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index d21d32541c..db3159875b 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -89,7 +89,7 @@ void connection_edge_send_command(connection_t *fromconn, circuit_t *circ, int r if(payload_len) { memcpy(cell.payload+RELAY_HEADER_SIZE,payload,payload_len); } - log_fn(LOG_INFO,"delivering %d cell %s.", relay_command, + log_fn(LOG_DEBUG,"delivering %d cell %s.", relay_command, cell_direction == CELL_DIRECTION_OUT ? "forward" : "backward"); if(circuit_deliver_relay_cell(&cell, circ, cell_direction, cpath_layer) < 0) { diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 663f301926..c473340995 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -188,7 +188,7 @@ static int connection_tls_finish_handshake(connection_t *conn) { if(tor_tls_peer_has_cert(conn->tls)) { /* it's another OR */ pk = tor_tls_verify(conn->tls); if(!pk) { - log_fn(LOG_WARNING,"Other side (%s:%p) has a cert but it's invalid. Closing.", + log_fn(LOG_WARNING,"Other side (%s:%d) has a cert but it's invalid. Closing.", conn->address, conn->port); return -1; } diff --git a/src/or/or.h b/src/or/or.h index 504a5e991f..ccfe80685f 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -95,7 +95,7 @@ #include "../common/log.h" #include "../common/util.h" -#define RECOMMENDED_SOFTWARE_VERSIONS "0.0.2pre8,0.0.2pre9,0.0.2pre10" +#define RECOMMENDED_SOFTWARE_VERSIONS "0.0.2pre8,0.0.2pre9,0.0.2pre10,0.0.2pre11" #define MAXCONNECTIONS 1000 /* upper bound on max connections. can be lowered by config file */ |