February 2011 - tor-commits - lists.torproject.org

[tor/maint-0.2.2] Fix two potential bugs in the bug1863 code.
by nickm＠torproject.org 25 Feb '11

25 Feb '11

commit 0642b927928df4ec556a76fed4b0b4523d515a7d Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Feb 24 16:44:54 2011 +0100 Fix two potential bugs in the bug1863 code. --- src/or/rephist.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index 265fff8..3f4a704 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1513,7 +1513,7 @@ rep_hist_update_bwhist_state_section(or_state_t *state, smartlist_free(*s_values); } if (*s_maxima) { - SMARTLIST_FOREACH(*s_values, char *, val, tor_free(val)); + SMARTLIST_FOREACH(*s_maxima, char *, val, tor_free(val)); smartlist_free(*s_maxima); } if (! server_mode(get_options())) { @@ -1541,7 +1541,7 @@ rep_hist_update_bwhist_state_section(or_state_t *state, i = (b->num_maxes_set <= b->next_max_idx) ? 0 : b->next_max_idx; for (j=0; j < b->num_maxes_set; ++j,++i) { uint64_t maxval; - if (i > NUM_TOTALS) + if (i >= NUM_TOTALS) i = 0; tor_asprintf(&cp, U64_FORMAT, U64_PRINTF_ARG(b->totals[i] & ~0x3ff)); smartlist_add(*s_values, cp);

1 0

[tor/maint-0.2.2] Merge branch 'bug1863_bwhist' into maint-0.2.2
by nickm＠torproject.org 25 Feb '11

25 Feb '11

commit aa178aae03048caf24ce5df4b2d643c7e7afdc7b Merge: 16b8b9b 0642b92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 25 11:22:12 2011 -0500 Merge branch 'bug1863_bwhist' into maint-0.2.2 changes/1863_bwhist | 16 +++ src/or/config.c | 4 + src/or/or.h | 8 ++- src/or/rephist.c | 295 +++++++++++++++++++++++++++----------------------- 4 files changed, 186 insertions(+), 137 deletions(-) diff --combined src/or/config.c index 178ed1e,78978dc..4d2c872 --- a/src/or/config.c +++ b/src/or/config.c @@@ -195,7 -195,6 +195,7 @@@ static config_var_t _option_vars[] = V(CircuitStreamTimeout, INTERVAL, "0"), V(CircuitPriorityHalflife, DOUBLE, "-100.0"), /*negative:'Use default'*/ V(ClientDNSRejectInternalAddresses, BOOL,"1"), + V(ClientRejectInternalAddresses, BOOL, "1"), V(ClientOnly, BOOL, "0"), V(ConsensusParams, STRING, NULL), V(ConnLimit, UINT, "1000"), @@@ -288,7 -287,6 +288,7 @@@ OBSOLETE("IgnoreVersion"), V(KeepalivePeriod, INTERVAL, "5 minutes"), VAR("Log", LINELIST, Logs, NULL), + V(LogMessageDomains, BOOL, "0"), OBSOLETE("LinkPadding"), OBSOLETE("LogLevel"), OBSOLETE("LogFile"), @@@ -407,7 -405,6 +407,7 @@@ static config_var_t testing_tor_network V(AuthDirMaxServersPerAddr, UINT, "0"), V(AuthDirMaxServersPerAuthAddr,UINT, "0"), V(ClientDNSRejectInternalAddresses, BOOL,"0"), + V(ClientRejectInternalAddresses, BOOL, "0"), V(ExitPolicyRejectPrivate, BOOL, "0"), V(V3AuthVotingInterval, INTERVAL, "5 minutes"), V(V3AuthVoteDelay, INTERVAL, "20 seconds"), @@@ -446,15 -443,19 +446,19 @@@ static config_var_t _state_vars[] = V(BWHistoryReadEnds, ISOTIME, NULL), V(BWHistoryReadInterval, UINT, "900"), V(BWHistoryReadValues, CSV, ""), + V(BWHistoryReadMaxima, CSV, ""), V(BWHistoryWriteEnds, ISOTIME, NULL), V(BWHistoryWriteInterval, UINT, "900"), V(BWHistoryWriteValues, CSV, ""), + V(BWHistoryWriteMaxima, CSV, ""), V(BWHistoryDirReadEnds, ISOTIME, NULL), V(BWHistoryDirReadInterval, UINT, "900"), V(BWHistoryDirReadValues, CSV, ""), + V(BWHistoryDirReadMaxima, CSV, ""), V(BWHistoryDirWriteEnds, ISOTIME, NULL), V(BWHistoryDirWriteInterval, UINT, "900"), V(BWHistoryDirWriteValues, CSV, ""), + V(BWHistoryDirWriteMaxima, CSV, ""), V(TorVersion, STRING, NULL), @@@ -1253,6 -1254,7 +1257,6 @@@ options_act(or_options_t *old_options /* Check for transitions that need action. */ if (old_options) { - if ((options->UseEntryGuards && !old_options->UseEntryGuards) || (options->ExcludeNodes && !routerset_equal(old_options->ExcludeNodes,options->ExcludeNodes)) || @@@ -1300,12 -1302,11 +1304,12 @@@ if (options_transition_affects_workers(old_options, options)) { log_info(LD_GENERAL, "Worker-related options changed. Rotating workers."); + + if (init_keys() < 0) { + log_warn(LD_BUG,"Error initializing keys; exiting"); + return -1; + } if (server_mode(options) && !server_mode(old_options)) { - if (init_keys() < 0) { - log_warn(LD_BUG,"Error initializing keys; exiting"); - return -1; - } ip_address_changed(0); if (can_complete_circuit || !any_predicted_circuits(time(NULL))) inform_testing_reachability(); @@@ -2842,9 -2843,7 +2846,9 @@@ compute_publishserverdescriptor(or_opti else if (!strcasecmp(string, "bridge")) *auth |= BRIDGE_AUTHORITY; else if (!strcasecmp(string, "hidserv")) - *auth |= HIDSERV_AUTHORITY; + log_warn(LD_CONFIG, + "PublishServerDescriptor hidserv is invalid. See " + "PublishHidServDescriptors."); else if (!strcasecmp(string, "") || !strcmp(string, "0")) /* no authority */; else @@@ -3348,11 -3347,6 +3352,11 @@@ options_validate(or_options_t *old_opti "PerConnBWBurst", msg) < 0) return -1; + if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) + options->RelayBandwidthBurst = options->RelayBandwidthRate; + if (options->RelayBandwidthBurst && !options->RelayBandwidthRate) + options->RelayBandwidthRate = options->RelayBandwidthBurst; + if (server_mode(options)) { if (options->BandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { tor_asprintf(msg, @@@ -3381,6 -3375,9 +3385,6 @@@ } } - if (options->RelayBandwidthRate && !options->RelayBandwidthBurst) - options->RelayBandwidthBurst = options->RelayBandwidthRate; - if (options->RelayBandwidthRate > options->RelayBandwidthBurst) REJECT("RelayBandwidthBurst must be at least equal " "to RelayBandwidthRate."); @@@ -3817,9 -3814,7 +3821,9 @@@ options_transition_affects_workers(or_o new_options->ServerDNSSearchDomains || old_options->SafeLogging != new_options->SafeLogging || old_options->ClientOnly != new_options->ClientOnly || - !config_lines_eq(old_options->Logs, new_options->Logs)) + public_server_mode(old_options) != public_server_mode(new_options) || + !config_lines_eq(old_options->Logs, new_options->Logs) || + old_options->LogMessageDomains != new_options->LogMessageDomains) return 1; /* Check whether log options match. */ @@@ -4395,9 -4390,6 +4399,9 @@@ options_init_logs(or_options_t *options } smartlist_free(elts); + if (ok && !validate_only) + logs_set_domain_logging(options->LogMessageDomains); + return ok?0:-1; } @@@ -5157,9 -5149,6 +5161,9 @@@ or_state_load(void return r; } +/** If writing the state to disk fails, try again after this many seconds. */ +#define STATE_WRITE_RETRY_INTERVAL 3600 + /** Write the persistent state to disk. Return 0 for success, <0 on failure. */ int or_state_save(time_t now) @@@ -5194,14 -5183,10 +5198,14 @@@ tor_free(state); fname = get_datadir_fname("state"); if (write_str_to_file(fname, contents, 0)<0) { - log_warn(LD_FS, "Unable to write state to file \"%s\"", fname); + log_warn(LD_FS, "Unable to write state to file \"%s\"; " + "will try again later", fname); global_state->LastWritten = -1; tor_free(fname); tor_free(contents); + /* Try again after STATE_WRITE_RETRY_INTERVAL (or sooner, if the state + * changes sooner). */ + global_state->next_write = now + STATE_WRITE_RETRY_INTERVAL; return -1; } diff --combined src/or/or.h index 2a55668,e0f8bab..74ff743 --- a/src/or/or.h +++ b/src/or/or.h @@@ -583,9 -583,6 +583,9 @@@ typedef enum /** This is a connection on the NATD port, and the destination IP:Port was * either ill-formed or out-of-range. */ #define END_STREAM_REASON_INVALID_NATD_DEST 261 +/** The target address is in a private network (like 127.0.0.1 or 10.0.0.1); + * you don't want to do that over a randomly chosen exit */ +#define END_STREAM_REASON_PRIVATE_ADDR 262 /** Bitwise-and this value with endreason to mask out all flags. */ #define END_STREAM_REASON_MASK 511 @@@ -768,8 -765,6 +768,8 @@@ typedef enum /** Initial value for both sides of a circuit transmission window when the * circuit is initialized. Measured in cells. */ #define CIRCWINDOW_START 1000 +#define CIRCWINDOW_START_MIN 100 +#define CIRCWINDOW_START_MAX 1000 /** Amount to increment a circuit window when we get a circuit SENDME. */ #define CIRCWINDOW_INCREMENT 100 /** Initial value on both sides of a stream transmission window when the @@@ -1173,10 -1168,6 +1173,10 @@@ typedef struct edge_connection_t * zero, abandon the associated mapaddress. */ unsigned int chosen_exit_retries:3; + /** True iff this is an AP connection that came from a transparent or + * NATd connection */ + unsigned int is_transparent_ap:1; + /** If this is a DNSPort connection, this field holds the pending DNS * request that we're going to try to answer. */ struct evdns_server_request *dns_server_request; @@@ -2345,9 -2336,6 +2345,9 @@@ typedef struct config_line_t *Logs; /**< New-style list of configuration lines * for logs */ + int LogMessageDomains; /**< Boolean: Should we log the domain(s) in which + * each log message occurs? */ + char *DebugLogFile; /**< Where to send verbose log messages. */ char *DataDirectory; /**< OR only: where to store long-term data. */ char *Nickname; /**< OR only: nickname of this onion router. */ @@@ -2759,10 -2747,6 +2759,10 @@@ * Helps avoid some cross-site attacks. */ int ClientDNSRejectInternalAddresses; + /** If true, do not accept any requests to connect to internal addresses + * over randomly chosen exits. */ + int ClientRejectInternalAddresses; + /** The length of time that we think a consensus should be fresh. */ int V3AuthVotingInterval; /** The length of time we think it will take to distribute votes. */ @@@ -2872,19 -2856,25 +2872,25 @@@ typedef struct * bandwidth usage. The "Interval" fields hold the granularity, in seconds, * of the entries of Values. The "Values" lists hold decimal string * representations of the number of bytes read or written in each - * interval. */ + * interval. The "Maxima" list holds decimal strings describing the highest + * rate achieved during the interval. + */ time_t BWHistoryReadEnds; int BWHistoryReadInterval; smartlist_t *BWHistoryReadValues; + smartlist_t *BWHistoryReadMaxima; time_t BWHistoryWriteEnds; int BWHistoryWriteInterval; smartlist_t *BWHistoryWriteValues; + smartlist_t *BWHistoryWriteMaxima; time_t BWHistoryDirReadEnds; int BWHistoryDirReadInterval; smartlist_t *BWHistoryDirReadValues; + smartlist_t *BWHistoryDirReadMaxima; time_t BWHistoryDirWriteEnds; int BWHistoryDirWriteInterval; smartlist_t *BWHistoryDirWriteValues; + smartlist_t *BWHistoryDirWriteMaxima; /** Build time histogram */ config_line_t * BuildtimeHistogram; @@@ -2958,11 -2948,6 +2964,11 @@@ struct socks_request_t /* Circuit Build Timeout "public" structures. */ +/** Precision multiplier for the Bw weights */ +#define BW_WEIGHT_SCALE 10000 +#define BW_MIN_WEIGHT_SCALE 1 +#define BW_MAX_WEIGHT_SCALE INT32_MAX + /** Total size of the circuit timeout history to accumulate. * 1000 is approx 2.5 days worth of continual-use circuits. */ #define CBT_NCIRCUITS_TO_OBSERVE 1000 @@@ -2972,8 -2957,6 +2978,8 @@@ /** Number of modes to use in the weighted-avg computation of Xm */ #define CBT_DEFAULT_NUM_XM_MODES 3 +#define CBT_MIN_NUM_XM_MODES 1 +#define CBT_MAX_NUM_XM_MODES 20 /** A build_time_t is milliseconds */ typedef uint32_t build_time_t; @@@ -2995,16 -2978,12 +3001,16 @@@ * build in terms of CDF quantile. */ #define CBT_DEFAULT_CLOSE_QUANTILE 95 +#define CBT_MIN_CLOSE_QUANTILE CBT_MIN_QUANTILE_CUTOFF +#define CBT_MAX_CLOSE_QUANTILE CBT_MAX_QUANTILE_CUTOFF /** * How many circuits count as recent when considering if the * connection has gone gimpy or changed. */ #define CBT_DEFAULT_RECENT_CIRCUITS 20 +#define CBT_MIN_RECENT_CIRCUITS 3 +#define CBT_MAX_RECENT_CIRCUITS 1000 /** * Maximum count of timeouts that finish the first hop in the past @@@ -3015,37 -2994,25 +3021,37 @@@ * gives us. */ #define CBT_DEFAULT_MAX_RECENT_TIMEOUT_COUNT (CBT_DEFAULT_RECENT_CIRCUITS*9/10) +#define CBT_MIN_MAX_RECENT_TIMEOUT_COUNT 3 +#define CBT_MAX_MAX_RECENT_TIMEOUT_COUNT 10000 /** Minimum circuits before estimating a timeout */ #define CBT_DEFAULT_MIN_CIRCUITS_TO_OBSERVE 100 +#define CBT_MIN_MIN_CIRCUITS_TO_OBSERVE 1 +#define CBT_MAX_MIN_CIRCUITS_TO_OBSERVE 10000 /** Cutoff percentile on the CDF for our timeout estimation. */ #define CBT_DEFAULT_QUANTILE_CUTOFF 80 +#define CBT_MIN_QUANTILE_CUTOFF 10 +#define CBT_MAX_QUANTILE_CUTOFF 99 double circuit_build_times_quantile_cutoff(void); /** How often in seconds should we build a test circuit */ #define CBT_DEFAULT_TEST_FREQUENCY 60 +#define CBT_MIN_TEST_FREQUENCY 1 +#define CBT_MAX_TEST_FREQUENCY INT32_MAX /** Lowest allowable value for CircuitBuildTimeout in milliseconds */ #define CBT_DEFAULT_TIMEOUT_MIN_VALUE (1500) +#define CBT_MIN_TIMEOUT_MIN_VALUE 500 +#define CBT_MAX_TIMEOUT_MIN_VALUE INT32_MAX /** Initial circuit build timeout in milliseconds */ #define CBT_DEFAULT_TIMEOUT_INITIAL_VALUE (60*1000) +#define CBT_MIN_TIMEOUT_INITIAL_VALUE CBT_MIN_TIMEOUT_MIN_VALUE +#define CBT_MAX_TIMEOUT_INITIAL_VALUE INT32_MAX int32_t circuit_build_times_initial_timeout(void); -#if CBT_DEFAULT_MAX_RECENT_TIMEOUT_COUNT < 1 +#if CBT_DEFAULT_MAX_RECENT_TIMEOUT_COUNT < CBT_MIN_MAX_RECENT_TIMEOUT_COUNT #error "RECENT_CIRCUITS is set too low." #endif

1 0

[tor/maint-0.2.2] On bwhist state load failure, clear dir_read/write hist too
by nickm＠torproject.org 25 Feb '11

25 Feb '11

commit 28844c8403f16f184c185798c78dcd6a959450a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 10 13:15:51 2011 -0500 On bwhist state load failure, clear dir_read/write hist too --- changes/1863_bwhist | 5 +++++ src/or/rephist.c | 13 +++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/changes/1863_bwhist b/changes/1863_bwhist index c1d4d86..b9e8ef4 100644 --- a/changes/1863_bwhist +++ b/changes/1863_bwhist @@ -3,3 +3,8 @@ triggered if a future version of Tor ever changed the timing granularity at which bandwidth history is measured. Bugfix on Tor 0.1.1.11-alpha. + - Correctly clear out dir_read/dir_write history when there is an + error parsing any bw history value from the state file. Bugfix on + Tor 0.2.2.15-alpha. + + diff --git a/src/or/rephist.c b/src/or/rephist.c index 5a3a15e..f0dd451 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1293,10 +1293,15 @@ static bw_array_t *dir_read_array = NULL; directory protocol. */ static bw_array_t *dir_write_array = NULL; -/** Set up [dir-]read_array and [dir-]write_array. */ +/** Set up [dir-]read_array and [dir-]write_array, freeing them if they alrady + * exist. */ static void bw_arrays_init(void) { + tor_free(read_array); + tor_free(write_array); + tor_free(dir_read_array); + tor_free(dir_write_array); read_array = bw_array_new(); write_array = bw_array_new(); dir_read_array = bw_array_new(); @@ -1627,11 +1632,7 @@ rep_hist_load_state(or_state_t *state, char **err) if (!all_ok) { *err = tor_strdup("Parsing of bandwidth history values failed"); /* and create fresh arrays */ - tor_free(read_array); - tor_free(write_array); - - read_array = bw_array_new(); - write_array = bw_array_new(); + bw_arrays_init(); return -1; } return 0;

1 0

[tor/maint-0.2.2] Fix bug when parsing bwhist with unexpected Interval
by nickm＠torproject.org 25 Feb '11

25 Feb '11

commit 7e1502c0d1aa0875fba0b26ddcf021bdfa5e11a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 10 13:06:50 2011 -0500 Fix bug when parsing bwhist with unexpected Interval Previously, our state parsing code would fail to parse a bwhist correctly if the Interval was anything other than the default hardcoded 15 minutes. This change makes the parsing less incorrect, though the resulting history array might get strange values in it if the intervals don't match the one we're using. (That is, if stuff was generated in 15 minute intervals, and we read it into an array that expects 30 minute intervals, we're fine, since values can be combined pairwise. But if we generate data at 30 minute intervals and read it into 15 minute intervals, alternating buckets will be empty.) Bugfix on 0.1.1.11-alpha. --- changes/1863_bwhist | 5 +++++ src/or/rephist.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-) diff --git a/changes/1863_bwhist b/changes/1863_bwhist new file mode 100644 index 0000000..c1d4d86 --- /dev/null +++ b/changes/1863_bwhist @@ -0,0 +1,5 @@ + o Minor bugfixes + - Fix a bug in banwidth history state parsing that could have been + triggered if a future version of Tor ever changed the timing + granularity at which bandwidth history is measured. Bugfix on + Tor 0.1.1.11-alpha. diff --git a/src/or/rephist.c b/src/or/rephist.c index c220426..5a3a15e 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1165,6 +1165,8 @@ rep_hist_load_mtbf_data(time_t now) * totals? */ #define NUM_SECS_ROLLING_MEASURE 10 /** How large are the intervals for which we track and report bandwidth use? */ +/* XXXX Watch out! Before Tor 0.2.2.21-alpha, using any other value here would + * generate an unparseable state file. */ #define NUM_SECS_BW_SUM_INTERVAL (15*60) /** How far in the past do we remember and publish bandwidth use? */ #define NUM_SECS_BW_SUM_IS_VALID (24*60*60) @@ -1577,7 +1579,9 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, } if (start < now) { add_obs(b, start, v); - start += NUM_SECS_BW_SUM_INTERVAL; + /* This will result in some fairly choppy history if s_interval + * is notthe same as NUM_SECS_BW_SUM_INTERVAL. XXXX */ + start += s_interval; } } SMARTLIST_FOREACH_END(cp); }

1 0

[tor/maint-0.2.2] Turn the loop bodies of rep_hist_save/load_state into functions
by nickm＠torproject.org 25 Feb '11

25 Feb '11

commit 8dd4ecd14e6e6e886c76c8464595d4f903447c42 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jan 10 12:57:44 2011 -0500 Turn the loop bodies of rep_hist_save/load_state into functions The trick of looping from i=0..4 , switching on i to set up some variables, then running some common code is much better expressed by just calling a function 4 times with 4 sets of arguments. This should make the code a little easier to follow and maintain here. --- src/or/rephist.c | 243 +++++++++++++++++++++++++---------------------------- 1 files changed, 115 insertions(+), 128 deletions(-) diff --git a/src/or/rephist.c b/src/or/rephist.c index d85a8b7..c220426 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1392,7 +1392,7 @@ rep_hist_bandwidth_assess(void) * It returns the number of bytes written. */ static size_t -rep_hist_fill_bandwidth_history(char *buf, size_t len, bw_array_t *b) +rep_hist_fill_bandwidth_history(char *buf, size_t len, const bw_array_t *b) { char *cp = buf; int i, n; @@ -1484,161 +1484,148 @@ rep_hist_get_bandwidth_lines(void) return buf; } +/** Write a single bw_warray_t from its Values, Ends, and Interval entries + * from a state. */ +static void +rep_hist_update_bwhist_state_section(or_state_t *state, + const bw_array_t *b, + smartlist_t **s_values, + time_t *s_begins, + int *s_interval) +{ + char buf[20*NUM_TOTALS + 1], *cp; + + if (*s_values) { + SMARTLIST_FOREACH(*s_values, char *, val, tor_free(val)); + smartlist_free(*s_values); + } + if (! server_mode(get_options())) { + /* Clients don't need to store bandwidth history persistently; + * force these values to the defaults. */ + /* FFFF we should pull the default out of config.c's state table, + * so we don't have two defaults. */ + if (*s_begins != 0 || *s_interval != 900) { + time_t now = time(NULL); + time_t save_at = get_options()->AvoidDiskWrites ? now+3600 : now+600; + or_state_mark_dirty(state, save_at); + } + *s_begins = 0; + *s_interval = 900; + *s_values = smartlist_create(); + return; + } + *s_begins = b->next_period; + *s_interval = NUM_SECS_BW_SUM_INTERVAL; + cp = buf; + cp += rep_hist_fill_bandwidth_history(cp, sizeof(buf), b); + tor_snprintf(cp, sizeof(buf)-(cp-buf), + cp == buf ? U64_FORMAT : ","U64_FORMAT, + U64_PRINTF_ARG(b->total_in_period)); + *s_values = smartlist_create(); + if (server_mode(get_options())) + smartlist_split_string(*s_values, buf, ",", SPLIT_SKIP_SPACE, 0); +} + /** Update <b>state</b> with the newest bandwidth history. */ void rep_hist_update_state(or_state_t *state) { - int len, r; - char *buf, *cp; - smartlist_t **s_values = NULL; - time_t *s_begins = NULL; - int *s_interval = NULL; - bw_array_t *b = NULL; +#define UPDATE(arrname,st) \ + rep_hist_update_bwhist_state_section(state,\ + (arrname),\ + &state->BWHistory ## st ## Values, \ + &state->BWHistory ## st ## Ends, \ + &state->BWHistory ## st ## Interval) - len = 20*NUM_TOTALS+1; - buf = tor_malloc_zero(len); + UPDATE(write_array, Write); + UPDATE(read_array, Read); + UPDATE(dir_write_array, DirWrite); + UPDATE(dir_read_array, DirRead); - for (r=0;r<4;++r) { - switch (r) { - case 0: - b = write_array; - s_begins = &state->BWHistoryWriteEnds; - s_interval = &state->BWHistoryWriteInterval; - s_values = &state->BWHistoryWriteValues; - break; - case 1: - b = read_array; - s_begins = &state->BWHistoryReadEnds; - s_interval = &state->BWHistoryReadInterval; - s_values = &state->BWHistoryReadValues; - break; - case 2: - b = dir_write_array; - s_begins = &state->BWHistoryDirWriteEnds; - s_interval = &state->BWHistoryDirWriteInterval; - s_values = &state->BWHistoryDirWriteValues; - break; - case 3: - b = dir_read_array; - s_begins = &state->BWHistoryDirReadEnds; - s_interval = &state->BWHistoryDirReadInterval; - s_values = &state->BWHistoryDirReadValues; - break; - } - if (*s_values) { - SMARTLIST_FOREACH(*s_values, char *, val, tor_free(val)); - smartlist_free(*s_values); - } - if (! server_mode(get_options())) { - /* Clients don't need to store bandwidth history persistently; - * force these values to the defaults. */ - /* FFFF we should pull the default out of config.c's state table, - * so we don't have two defaults. */ - if (*s_begins != 0 || *s_interval != 900) { - time_t now = time(NULL); - time_t save_at = get_options()->AvoidDiskWrites ? now+3600 : now+600; - or_state_mark_dirty(state, save_at); - } - *s_begins = 0; - *s_interval = 900; - *s_values = smartlist_create(); - continue; - } - *s_begins = b->next_period; - *s_interval = NUM_SECS_BW_SUM_INTERVAL; - cp = buf; - cp += rep_hist_fill_bandwidth_history(cp, len, b); - tor_snprintf(cp, len-(cp-buf), cp == buf ? U64_FORMAT : ","U64_FORMAT, - U64_PRINTF_ARG(b->total_in_period)); - *s_values = smartlist_create(); - if (server_mode(get_options())) - smartlist_split_string(*s_values, buf, ",", SPLIT_SKIP_SPACE, 0); - } - tor_free(buf); if (server_mode(get_options())) { - or_state_mark_dirty(get_or_state(), time(NULL)+(2*3600)); + or_state_mark_dirty(state, time(NULL)+(2*3600)); } +#undef UPDATE } -/** Set bandwidth history from our saved state. */ -int -rep_hist_load_state(or_state_t *state, char **err) +/** Load a single bw_warray_t from its Values, Ends, and Interval entries from + * a state. */ +static int +rep_hist_load_bwhist_state_section(bw_array_t *b, + const smartlist_t *s_values, + const time_t s_begins, + const int s_interval) { - time_t s_begins = 0, start; time_t now = time(NULL); - uint64_t v; - int r,i,ok; - int all_ok = 1; - int s_interval = 0; - smartlist_t *s_values = NULL; - bw_array_t *b = NULL; - - /* Assert they already have been malloced */ - tor_assert(read_array && write_array); + int retval = 0; + time_t start; - for (r=0;r<4;++r) { - switch (r) { - case 0: - b = write_array; - s_begins = state->BWHistoryWriteEnds; - s_interval = state->BWHistoryWriteInterval; - s_values = state->BWHistoryWriteValues; - break; - case 1: - b = read_array; - s_begins = state->BWHistoryReadEnds; - s_interval = state->BWHistoryReadInterval; - s_values = state->BWHistoryReadValues; - break; - case 2: - b = dir_write_array; - s_begins = state->BWHistoryDirWriteEnds; - s_interval = state->BWHistoryDirWriteInterval; - s_values = state->BWHistoryDirWriteValues; - break; - case 3: - b = dir_read_array; - s_begins = state->BWHistoryDirReadEnds; - s_interval = state->BWHistoryDirReadInterval; - s_values = state->BWHistoryDirReadValues; - break; - } - if (s_values && s_begins >= now - NUM_SECS_BW_SUM_INTERVAL*NUM_TOTALS) { - start = s_begins - s_interval*(smartlist_len(s_values)); - if (start > now) - continue; - b->cur_obs_time = start; - b->next_period = start + NUM_SECS_BW_SUM_INTERVAL; - SMARTLIST_FOREACH(s_values, char *, cp, { + uint64_t v; + int i,ok; + + if (s_values && s_begins >= now - NUM_SECS_BW_SUM_INTERVAL*NUM_TOTALS) { + start = s_begins - s_interval*(smartlist_len(s_values)); + if (start > now) + return 0; + b->cur_obs_time = start; + b->next_period = start + NUM_SECS_BW_SUM_INTERVAL; + SMARTLIST_FOREACH_BEGIN(s_values, const char *, cp) { v = tor_parse_uint64(cp, 10, 0, UINT64_MAX, &ok, NULL); if (!ok) { - all_ok=0; + retval = -1; log_notice(LD_HIST, "Could not parse '%s' into a number.'", cp); } if (start < now) { add_obs(b, start, v); start += NUM_SECS_BW_SUM_INTERVAL; } - }); - } + } SMARTLIST_FOREACH_END(cp); + } - /* Clean up maxima and observed */ - /* Do we really want to zero this for the purpose of max capacity? */ - for (i=0; i<NUM_SECS_ROLLING_MEASURE; ++i) { - b->obs[i] = 0; - } - b->total_obs = 0; - for (i=0; i<NUM_TOTALS; ++i) { - b->maxima[i] = 0; - } - b->max_total = 0; + /* Clean up maxima and observed */ + /* Do we really want to zero this for the purpose of max capacity? */ + for (i=0; i<NUM_SECS_ROLLING_MEASURE; ++i) { + b->obs[i] = 0; + } + b->total_obs = 0; + for (i=0; i<NUM_TOTALS; ++i) { + b->maxima[i] = 0; } + b->max_total = 0; + + return retval; +} + +/** Set bandwidth history from our saved state. */ +int +rep_hist_load_state(or_state_t *state, char **err) +{ + int all_ok = 1; + /* Assert they already have been malloced */ + tor_assert(read_array && write_array); + tor_assert(dir_read_array && dir_write_array); + +#define LOAD(arrname,st) \ + if (rep_hist_load_bwhist_state_section( \ + (arrname), \ + state->BWHistory ## st ## Values, \ + state->BWHistory ## st ## Ends, \ + state->BWHistory ## st ## Interval)<0) \ + all_ok = 0 + + LOAD(write_array, Write); + LOAD(read_array, Read); + LOAD(dir_write_array, DirWrite); + LOAD(dir_read_array, DirRead); + +#undef LOAD if (!all_ok) { *err = tor_strdup("Parsing of bandwidth history values failed"); /* and create fresh arrays */ tor_free(read_array); tor_free(write_array); + read_array = bw_array_new(); write_array = bw_array_new(); return -1;

1 0

[torperf/master] Clean up unused files, update README and LICENSE.
by karsten＠torproject.org 25 Feb '11

25 Feb '11

commit 04b048379b43ffa586e44fabf7af5565f6227090 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 23 11:40:25 2011 +0100 Clean up unused files, update README and LICENSE. --- LICENSE | 1 + README | 17 ++++++++++++++--- plot_results.R | 4 ++++ run_test.py | 3 +++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/LICENSE b/LICENSE index 35f2eb7..c52ccc7 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,7 @@ Copyright (c) 2003 Roger Dingledine Copyright (c) 2004-2007 Roger Dingledine, Nick Mathewson Copyright (c) 2007 Roger Dingledine, Nick Mathewson, Steven J. Murdoch +Copyright (c) 2008-2011 The Tor Project Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are diff --git a/README b/README index b1ecdcc..c4769d4 100644 --- a/README +++ b/README @@ -11,10 +11,21 @@ Contents Makefile: Builds and tests trivsocks-client - run_test.py: Script to automate running of trivsocks-client - plot_results.R: Plot the results from run_test.py +[run_test.py: Script to automate running of trivsocks-client -- defect] +[plot_results.R: Plot the results from run_test.py -- defect] + + measurements-HOWTO: Instructions for setting up Torperf + example_start-tors_fastslow.txt: Example start script for Torperfs with + custom guard node selection + extra_stats.py: Tor controller that prints out details of the circuits + used for Torperf measurements + entrycons.py: (optional) Tor controller that influences guard node + selection + analyze_guards.py: Script to check whether custom guard node was working + as expected + consolidate_stats.py: Script to merge the two output data files with + performance data and path data LICENSE: The Tor license (3-clause BSD) README: This file -Steven J. Murdoch <http://www.cl.cam.ac.uk/users/sjm217/> diff --git a/plot_results.R b/plot_results.R index ecd5795..a291414 100644 --- a/plot_results.R +++ b/plot_results.R @@ -1,6 +1,10 @@ ### Copyright 2007 Steven J. Murdoch ### See LICENSE for licensing information +### XXX This script is broken, but we should look at it some more and +### maybe reuse parts of it when implementing Trac ticket #2563 (Add R +### code for processing Torperf data to the Torperf repository) + UFACTOR = 1e6 ## Subtract to timevals, maintaining precision diff --git a/run_test.py b/run_test.py index 2b9bf5d..3054f4b 100755 --- a/run_test.py +++ b/run_test.py @@ -3,6 +3,9 @@ ### Copyright 2007 Steven J. Murdoch ### See LICENSE for licensing information +### XXX This script is broken, but we might want to reuse parts of it for +### implementing Trac ticket #2565 (Redesign Python parts in Torperf) + import os import time

1 0

[torperf/master] Merge branch 'task2603'
by karsten＠torproject.org 25 Feb '11

25 Feb '11

commit ad721cbd31f2a9b2df8fc26932f7ad15197022ee Merge: a7a3d12 04b0483 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 25 08:39:56 2011 +0100 Merge branch 'task2603' LICENSE | 1 + README | 17 ++++++++++++++--- plot_results.R | 4 ++++ run_test.py | 3 +++ 4 files changed, 22 insertions(+), 3 deletions(-)

1 0

[torperf/master] Update timeout script instructions for Squeeze.
by karsten＠torproject.org 25 Feb '11

25 Feb '11

commit 4a91835db47c59a34dc0724405ffd1c477b9b157 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 23 15:40:14 2011 +0100 Update timeout script instructions for Squeeze. --- measurements-HOWTO | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --git a/measurements-HOWTO b/measurements-HOWTO index 9c78992..089073f 100644 --- a/measurements-HOWTO +++ b/measurements-HOWTO @@ -119,8 +119,12 @@ Install the timeout tool: $ sudo apt-get install timeout # Lenny $ sudo apt-get install coreutils # Squeeze -Add crontab entries to start the regular requests (line breaks are only -for formatting purposes here): +Add crontab entries to start the regular requests. + +Note that the syntax of the timeout script in Lenny is different from the +one in Squeeze. When in doubt, look up the correct syntax in the man +page. For the timeout script contained in Lenny, the crontab entries +would be as follows (line breaks are only for formatting purposes here): $ crontab -e @@ -134,6 +138,22 @@ $ crontab -e torperf.torproject.org 127.0.0.1:9022 /.5mbfile >> ~/torperf/5mb.data 2>/dev/null +For the timeout script in Squeeze, use the following crontab entries (the +only difference is that the first command-line argument is "-s2" instead +of "-2"; again, line breaks for formatting purposes only): + +$ crontab -e + +*/5 * * * * timeout -s2 295 ~/torperf/trivsocks-client + torperf.torproject.org 127.0.0.1:9020 /.50kbfile >> ~/torperf/50kb.data + 2>/dev/null +2,32 * * * * timeout -s2 1795 ~/torperf/trivsocks-client + torperf.torproject.org 127.0.0.1:9021 /.1mbfile >> ~/torperf/1mb.data + 2>/dev/null +8 * * * * timeout -s2 3595 ~/torperf/trivsocks-client + torperf.torproject.org 127.0.0.1:9022 /.5mbfile >> ~/torperf/5mb.data + 2>/dev/null + From now on, the three files 50kb.data, 1mb.data, and 5mb.data should accumulate lines like this (50kb.data shown here; line breaks are only for formatting purposes):

1 0

[torperf/master] Merge branch 'task2515' into master2
by karsten＠torproject.org 25 Feb '11

25 Feb '11

commit a7a3d12432a61f172caa8ed7b83e273afdf524d7 Merge: b240ae1 4a91835 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Feb 25 07:52:15 2011 +0100 Merge branch 'task2515' into master2 measurements-HOWTO | 24 ++++++++++++++++++++++-- 1 files changed, 22 insertions(+), 2 deletions(-) diff --combined measurements-HOWTO index e72969e,089073f..ddd014b --- a/measurements-HOWTO +++ b/measurements-HOWTO @@@ -119,8 -119,12 +119,12 @@@ Install the timeout tool $ sudo apt-get install timeout # Lenny $ sudo apt-get install coreutils # Squeeze - Add crontab entries to start the regular requests (line breaks are only - for formatting purposes here): + Add crontab entries to start the regular requests. + + Note that the syntax of the timeout script in Lenny is different from the + one in Squeeze. When in doubt, look up the correct syntax in the man + page. For the timeout script contained in Lenny, the crontab entries + would be as follows (line breaks are only for formatting purposes here): $ crontab -e @@@ -134,6 -138,22 +138,22 @@@ torperf.torproject.org 127.0.0.1:9022 /.5mbfile >> ~/torperf/5mb.data 2>/dev/null + For the timeout script in Squeeze, use the following crontab entries (the + only difference is that the first command-line argument is "-s2" instead + of "-2"; again, line breaks for formatting purposes only): + + $ crontab -e + + */5 * * * * timeout -s2 295 ~/torperf/trivsocks-client + torperf.torproject.org 127.0.0.1:9020 /.50kbfile >> ~/torperf/50kb.data + 2>/dev/null + 2,32 * * * * timeout -s2 1795 ~/torperf/trivsocks-client + torperf.torproject.org 127.0.0.1:9021 /.1mbfile >> ~/torperf/1mb.data + 2>/dev/null + 8 * * * * timeout -s2 3595 ~/torperf/trivsocks-client + torperf.torproject.org 127.0.0.1:9022 /.5mbfile >> ~/torperf/5mb.data + 2>/dev/null + From now on, the three files 50kb.data, 1mb.data, and 5mb.data should accumulate lines like this (50kb.data shown here; line breaks are only for formatting purposes): @@@ -163,33 -183,26 +183,33 @@@ startsec startuse writebytes readbytes The 50kb.extradata, 1mb.extradata, and 5mb.extradata files should -accumulate lines like this (linebreaks for formatting reasons): +accumulate lines with KEY=value pairs describing the following properties: -ok 1284059486 $ED16C4DD8E9BCACDE829E6B6571B58095383897A=PPrivCom030 - $80818E35A46DEED6889818ADC596404AB94E392A=Pandora14 - $4C23C8C30C66C87E1C875A949B4841E4305FFC57~Amunet11 +CIRC_ID: The circuit id from the control port +LAUNCH: The launch time of the circuit +PATH: The identity fingerprints of the members of the path +BUILDTIMES: Cumulative timer of how long before each hop was completed +USED_AT: Closing time for the Torperf stream (should match datacomplete*sec) +USED_BY: Control port stream id for this Torperf stream +TIMEOUT: The current CircuitBuildTimeout (in ms, pre-rounding) +QUANTILE: The current CircuitBuildTimeout quantile cutoff -with column headers: +In the event of error, the following fields may be present in lieu of +completion data: -ok|error timestamp firsthop secondhop thirdhop [fourthhop ...] +FAIL_REASONS: Reasons for circuit failure +STREAM_FAIL_REASONS: Reasons for stream failure -The first column indicates if this circuit was actually used to fetch -the data or if Tor chose a different circuit because this one was -problematic. For every error entry there should be a following ok -entry, unless the network of the torperf instance is totally dead or -the resource it wants to fetch is unavailable. +The files will also contain direct copies of the control port event +BUILDTIMEOUT_SET. See control-spec.txt for details of this. -The timestamp will NOT necessarily match the timestamps in the .data file -exactly, because additional processing is necessary. You should allow -for up to a minute of slack when matching the two files up. See the -consolidate_stats.py script that fulfills this job. +The USED_AT timestamp will NOT necessarily match the timestamps in the .data +file exactly, because additional processing is necessary. The timestamp from +the .data files that is closest to USED_AT is "datacompletesec +datacompleteusec". If the times are more than a second apart, something is +really wrong. + +XXX: consolidate-stats needs update, and no longer works. Call it like this:

1 0

r24265: {arm} Reimplementing layouts for the connection panel This is most (in arm/trunk/src: interface/connections util)
by Damian Johnson 25 Feb '11

25 Feb '11

Author: atagar Date: 2011-02-25 05:17:40 +0000 (Fri, 25 Feb 2011) New Revision: 24265 Modified: arm/trunk/src/interface/connections/connPanel.py arm/trunk/src/interface/connections/listings.py arm/trunk/src/util/torTools.py Log: Reimplementing layouts for the connection panel This is mostly functionally equivilant, but a sane implementation (there was a lot of headaches and voodoo in figuring out where previous measurements came from), plus has better space allocation. Columns have priorities for determining which are shown in the limited space. However, we're now fitting in lower priority entries that fit even if there isn't room for a bigger but higher priority column. added: smarter space utilization, filling in smaller columns if there isn't room for higher priority but larger entries fix: trivial crashing bug when fecthing relay nicknames Modified: arm/trunk/src/interface/connections/connPanel.py =================================================================== --- arm/trunk/src/interface/connections/connPanel.py 2011-02-24 22:47:15 UTC (rev 24264) +++ arm/trunk/src/interface/connections/connPanel.py 2011-02-25 05:17:40 UTC (rev 24265) @@ -147,7 +147,8 @@ xLoc = scrollOffset # prefix (entry data which is largely static, plus the time label) - entryLabel = entry.getLabel(Listing.IP, width - scrollOffset) + # the right content (time and type) takes seventeen columns + entryLabel = entry.getLabel(Listing.IP, width - scrollOffset - 17) timeLabel = uiTools.getTimeLabel(currentTime - entry.startTime, 1) prefixLabel = "%s%5s (" % (entryLabel, timeLabel) Modified: arm/trunk/src/interface/connections/listings.py =================================================================== --- arm/trunk/src/interface/connections/listings.py 2011-02-24 22:47:15 UTC (rev 24264) +++ arm/trunk/src/interface/connections/listings.py 2011-02-25 05:17:40 UTC (rev 24265) @@ -23,6 +23,11 @@ Category.CLIENT: "cyan", Category.DIRECTORY: "magenta", Category.CONTROL: "red"} +# static data for listing format +# <src> --> <dst> <etc><padding> +LABEL_FORMAT = "%s --> %s %s%s" +LABEL_MIN_PADDING = 2 # min space between listing label and following data + class Endpoint: """ Collection of attributes associated with a connection endpoint. This is a @@ -281,9 +286,15 @@ myType = self.getType() dstAddress = self.getDestinationLabel(26, DestAttr.LOCALE) + # The required widths are the sum of the following: + # - room for LABEL_FORMAT and LABEL_MIN_PADDING (11 characters) + # - base data for the listing + # - that extra field plus any previous + + usedSpace = len(LABEL_FORMAT % tuple([""] * 4)) + LABEL_MIN_PADDING + src, dst, etc = "", "", "" if listingType == connPanel.Listing.IP: - # base data requires 73 characters myExternalIpAddr = conn.getInfo("address", self.local.getIpAddr()) addrDiffer = myExternalIpAddr != self.local.getIpAddr() @@ -291,44 +302,50 @@ src = "%-21s" % srcAddress # ip:port = max of 21 characters dst = "%-26s" % dstAddress # ip:port (xx) = max of 26 characters - if width > 115: + usedSpace += len(src) + len(dst) # base data requires 47 characters + + if width > usedSpace + 42: # show fingerprint (column width: 42 characters) etc += "%-40s " % self.foreign.getFingerprint() + usedSpace += 42 - if addrDiffer and width > 143: + if addrDiffer and width > usedSpace + 28: # include the internal address in the src (extra 28 characters) internalAddress = "%s:%s" % (self.local.getIpAddr(), self.local.getPort()) src = "%-21s --> %s" % (internalAddress, src) + usedSpace += 28 - if (not addrDiffer and width > 143) or width > 155: + if width > usedSpace + 10: # show nickname (column width: remainder) - nicknameSpace = width - 146 + nicknameSpace = width - usedSpace nicknameLabel = uiTools.cropStr(self.foreign.getNickname(), nicknameSpace, 0) etc += ("%%-%is " % nicknameSpace) % nicknameLabel + usedSpace += nicknameSpace + 2 elif listingType == connPanel.Listing.HOSTNAME: - # base data requires 80 characters + # 15 characters for source, and a min of 40 reserved for the destination src = "localhost:%-5s" % self.local.getPort() + usedSpace += len(stc) + minHostnameSpace = 40 - # space available for foreign hostname (stretched to claim any free space) - hostnameSpace = width - 42 - - if width > 108: + if width > usedSpace + minHostnameSpace + 28: # show destination ip/port/locale (column width: 28 characters) - hostnameSpace -= 28 etc += "%-26s " % dstAddress + usedSpace += 28 - if width > 134: + if width > usedSpace + minHostnameSpace + 42: # show fingerprint (column width: 42 characters) - hostnameSpace -= 42 etc += "%-40s " % self.foreign.getFingerprint() + usedSpace += 42 - if width > 151: + if width > usedSpace + minHostnameSpace + 17: # show nickname (column width: min 17 characters, uses half of the remainder) - nicknameSpace = 15 + (width - 151) / 2 - hostnameSpace -= (nicknameSpace + 2) + nicknameSpace = 15 + (width - (usedSpace + minHostnameSpace + 17)) / 2 nicknameLabel = uiTools.cropStr(self.foreign.getNickname(), nicknameSpace, 0) etc += ("%%-%is " % nicknameSpace) % nicknameLabel + usedSpace += (nicknameSpace + 2) + hostnameSpace = width - usedSpace + usedSpace = width if self.isPrivate(): dst = ("%%-%is" % hostnameSpace) % "<scrubbed>" else: @@ -342,45 +359,58 @@ hostname = uiTools.cropStr(hostname, hostnameSpace, 0) dst = ("%%-%is:%%-5s" % hostnameSpace) % (hostname, port) elif listingType == connPanel.Listing.FINGERPRINT: - # base data requires 75 characters src = "localhost" if myType == Category.CONTROL: dst = "localhost" else: dst = self.foreign.getFingerprint() dst = "%-40s" % dst - if width > 92: - # show nickname (column width: min 17 characters, uses remainder if extra room's available) - nicknameSpace = width - 78 if width < 126 else width - 106 + usedSpace += len(src) + len(dst) # base data requires 49 characters + + if width > usedSpace + 17: + # show nickname (column width: min 17 characters, consumes any remaining space) + nicknameSpace = width - usedSpace + + # if there's room then also show a column with the destination + # ip/port/locale (column width: 28 characters) + isIpLocaleIncluded = width > usedSpace + 45 + if isIpLocaleIncluded: nicknameSpace -= 28 + + nicknameSpace = width - usedSpace - 28 if isIpLocaleVisible else width - usedSpace nicknameLabel = uiTools.cropStr(self.foreign.getNickname(), nicknameSpace, 0) etc += ("%%-%is " % nicknameSpace) % nicknameLabel - - if width > 125: - # show destination ip/port/locale (column width: 28 characters) - etc += "%-26s " % dstAddress + usedSpace += nicknameSpace + 2 + + if isIpLocaleIncluded: + etc += "%-26s " % dstAddress + usedSpace += 28 else: - # base data uses whatever extra room's available (using minimun of 50 characters) + # base data requires 50 min characters src = self.local.getNickname() if myType == Category.CONTROL: dst = self.local.getNickname() else: dst = self.foreign.getNickname() + minBaseSpace = 50 - # space available for foreign nickname - nicknameSpace = width - len(src) - 27 - - if width > 92: + if width > usedSpace + minBaseSpace + 42: # show fingerprint (column width: 42 characters) - nicknameSpace -= 42 etc += "%-40s " % self.foreign.getFingerprint() + usedSpace += 42 - if width > 120: + if width > usedSpace + minBaseSpace + 28: # show destination ip/port/locale (column width: 28 characters) - nicknameSpace -= 28 etc += "%-26s " % dstAddress + usedSpace += 28 - dst = ("%%-%is" % nicknameSpace) % dst + baseSpace = width - usedSpace + if len(src) + len(dst) > baseSpace: + src = uiTools.cropStr(src, baseSpace / 3) + dst = uiTools.cropStr(dst, baseSpace - len(src)) + + # pads dst entry to its max space + dst = ("%%-%is" % (baseSpace - len(src))) % dst if myType == Category.INBOUND: src, dst = dst, src - padding = width - len(src) - len(dst) - len(etc) - 27 - self._labelCache = "%s --> %s %s%s" % (src, dst, etc, " " * padding) + padding = " " * (width - usedSpace + LABEL_MIN_PADDING) + self._labelCache = LABEL_FORMAT % (src, dst, etc, padding) self._labelCacheArgs = (listingType, width) return self._labelCache Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-02-24 22:47:15 UTC (rev 24264) +++ arm/trunk/src/util/torTools.py 2011-02-25 05:17:40 UTC (rev 24265) @@ -911,7 +911,7 @@ if self.isAlive(): # query the nickname if it isn't yet cached if not relayFingerprint in self._nicknameLookupCache: - if relayFingerprint == getInfo("fingerprint"): + if relayFingerprint == self.getInfo("fingerprint"): # this is us, simply check the config myNickname = self.getOption("Nickname", "Unnamed") self._nicknameLookupCache[relayFingerprint] = myNickname

1 0