diff options
| author | Nick Mathewson <nickm@torproject.org> | 2008-02-19 19:30:37 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2008-02-19 19:30:37 +0000 |
| commit | b98c437fcc98a3e756706f3acbe419293e5c5a7f (patch) | |
| tree | 5ea0a642b88ebf2db9e8dbfb1086dc8402bad21c | |
| parent | ab4d3888e42368010efe4d03bc5b5d65501f566f (diff) | |
| download | tor-b98c437fcc98a3e756706f3acbe419293e5c5a7f.tar.gz tor-b98c437fcc98a3e756706f3acbe419293e5c5a7f.zip | |
r18195@catbus: nickm | 2008-02-19 14:11:15 -0500
TOR_PERF has not not been a sane thing for ages. Remove it.
svn:r13579
| -rw-r--r-- | src/or/circuitbuild.c | 5 | ||||
| -rw-r--r-- | src/or/or.h | 9 |
2 files changed, 1 insertions, 13 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index c639b843ff..aef1442aad 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -1039,15 +1039,12 @@ new_route_len(uint8_t purpose, extend_info_t *exit, tor_assert(routers); -#ifdef TOR_PERF - routelen = 2; -#else routelen = 3; if (exit && purpose != CIRCUIT_PURPOSE_TESTING && purpose != CIRCUIT_PURPOSE_S_ESTABLISH_INTRO) routelen++; -#endif + log_debug(LD_CIRC,"Chosen route length %d (%d routers available).", routelen, smartlist_len(routers)); diff --git a/src/or/or.h b/src/or/or.h index 325ea80300..a3ca0e94eb 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -647,14 +647,6 @@ typedef enum { #define CELL_DIRECTION_IN 1 #define CELL_DIRECTION_OUT 2 -#ifdef TOR_PERF -/* These options are here for internal testing on a separate network. If - * you enable them, you won't be compatible with the main Tor network. */ -#define CIRCWINDOW_START 10000 -#define CIRCWINDOW_INCREMENT 1000 -#define STREAMWINDOW_START 5000 -#define STREAMWINDOW_INCREMENT 500 -#else /** Initial value for both sides of a circuit transmission window when the * circuit is initialized. Measured in cells. */ #define CIRCWINDOW_START 1000 @@ -665,7 +657,6 @@ typedef enum { #define STREAMWINDOW_START 500 /** Amount to increment a stream window when we get a stream SENDME. */ #define STREAMWINDOW_INCREMENT 50 -#endif /* cell commands */ #define CELL_PADDING 0 |