- tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug3743'
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 14552a12b3b6ff0770153d9d2f116febad349303 Merge: 6a06f45 6650dc9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Aug 17 10:46:28 2011 -0400 Merge branch 'bug3743' src/or/config.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-)

1 0

[tor/master] Don't compare LINELIST_S and OBSOLETE config options.
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit e6e804848c4764f5ea0d6705707b2c81de4c02ae Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Aug 16 06:28:38 2011 +0500 Don't compare LINELIST_S and OBSOLETE config options. --- src/or/config.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index b4d733a..5d41ab6 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -591,6 +591,8 @@ static int write_configuration_file(const char *fname, static config_line_t *get_assigned_option(const config_format_t *fmt, const void *options, const char *key, int escape_val); +static const config_var_t *config_find_option(const config_format_t *fmt, + const char *key); static void config_init(const config_format_t *fmt, void *options); static int or_state_validate(or_state_t *old_options, or_state_t *options, int from_setconf, char **msg); @@ -699,6 +701,7 @@ set_options(or_options_t *new_val, char **msg) int i; smartlist_t *elements; config_line_t *line; + config_var_t *var; or_options_t *old_options = global_options; global_options = new_val; /* Note that we pass the *old* options below, for comparison. It @@ -718,6 +721,12 @@ set_options(or_options_t *new_val, char **msg) if (old_options) { elements = smartlist_create(); for (i=0; options_format.vars[i].name; ++i) { + var = config_find_option(&options_format, + options_format.vars[i].name); + if (var->type == CONFIG_TYPE_LINELIST_S || + var->type == CONFIG_TYPE_OBSOLETE) { + continue; + } if (!option_is_same(&options_format, new_val, old_options, options_format.vars[i].name)) { line = get_assigned_option(&options_format, new_val,

1 0

[tor/master] Actually pick a random port when "auto" is specified
by nickm＠torproject.org 17 Aug '11

17 Aug '11

commit 6a06f45b04b8c9336ff150d299732c67bb5cb885 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Aug 16 01:38:15 2011 +0200 Actually pick a random port when "auto" is specified ddc65e2b3303559ab7b842a176ee6c2eda9e4027 had broken this --- src/common/torint.h | 9 +++++++++ src/or/connection.c | 4 +++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/src/common/torint.h b/src/common/torint.h index 0b5c29a..af97547 100644 --- a/src/common/torint.h +++ b/src/common/torint.h @@ -111,6 +111,15 @@ typedef signed int int32_t; typedef unsigned int uint32_t; #define HAVE_UINT32_T #endif +#ifndef UINT16_MAX +#define UINT16_MAX 0xffffu +#endif +#ifndef INT16_MAX +#define INT16_MAX 0x7fff +#endif +#ifndef INT16_MIN +#define INT16_MIN (-INT16_MAX-1) +#endif #ifndef UINT32_MAX #define UINT32_MAX 0xffffffffu #endif diff --git a/src/or/connection.c b/src/or/connection.c index 2087ced..452ddc1 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1787,6 +1787,8 @@ retry_listener_ports(smartlist_t *old_conns, socklen_t listensocklen = 0; char *address=NULL; connection_t *conn; + int real_port = port->port == CFG_AUTO_PORT ? 0 : port->port; + tor_assert(real_port <= UINT16_MAX); if (port->is_unix_addr) { listensockaddr = (struct sockaddr *) @@ -1795,7 +1797,7 @@ retry_listener_ports(smartlist_t *old_conns, } else { listensockaddr = tor_malloc(sizeof(struct sockaddr_storage)); listensocklen = tor_addr_to_sockaddr(&port->addr, - port->port, + real_port, listensockaddr, sizeof(struct sockaddr_storage)); address = tor_dup_addr(&port->addr);

1 0

r24955: {website} update the cta buttons for those with the right color purple (website/trunk/images)
by Andrew Lewman 17 Aug '11

17 Aug '11

Author: phobos Date: 2011-08-17 03:59:30 +0000 (Wed, 17 Aug 2011) New Revision: 24955 Modified: website/trunk/images/cta-buttons.jpg Log: update the cta buttons for those with the right color purple. Modified: website/trunk/images/cta-buttons.jpg =================================================================== (Binary files differ)

1 0

[torbutton/master] Bug #523: Implement New Identity (for TBB only).
by mikeperry＠torproject.org 15 Aug '11

15 Aug '11

commit c67c7d74e84678a3767c718bc78f699138e1028f Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Mon Aug 15 13:51:35 2011 -0700 Bug #523: Implement New Identity (for TBB only). At long last, the witch is dead. --- src/chrome/content/popup.xul | 15 ++- src/chrome/content/torbutton.js | 245 ++++++++++++++++++++++++++++- src/chrome/locale/en/torbutton.dtd | 2 + src/chrome/locale/en/torbutton.properties | 1 + src/components/cookie-jar-selector.js | 4 + src/defaults/preferences/preferences.js | 1 + 6 files changed, 258 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/popup.xul b/src/chrome/content/popup.xul index 2297ccf..dd7a398 100644 --- a/src/chrome/content/popup.xul +++ b/src/chrome/content/popup.xul @@ -11,21 +11,26 @@ </stringbundleset> <menupopup id="torbutton-context-menu" onpopupshowing="torbutton_check_protections();" anchor="torbutton-button" position="after_start"> + <menuitem id="torbutton-new-identity" + label="&torbutton.context_menu.new_identity;" + accesskey="&torbutton.context_menu.new_identity_key;" + insertafter="context-stop" + oncommand="torbutton_new_identity()"/> <menuitem id="torbutton-toggle" label="&torbutton.context_menu.toggle;" accesskey="&torbutton.context_menu.toggle.key;" insertafter="context-stop" oncommand="torbutton_toggle(true)"/> - <menuitem id="torbutton-preferences" - label="&torbutton.context_menu.preferences;" - accesskey="&torbutton.context_menu.preferences.key;" - insertafter="context-stop" - oncommand="torbutton_open_prefs_dialog()"/> <menuitem id="torbutton-cookie-protector" label="&torbutton.context_menu.cookieProtections;" accesskey="&torbutton.context_menu.cookieProtections.key;" insertafter="context-stop" oncommand="torbutton_open_cookie_dialog()"/> + <menuitem id="torbutton-preferences" + label="&torbutton.context_menu.preferences;" + accesskey="&torbutton.context_menu.preferences.key;" + insertafter="context-stop" + oncommand="torbutton_open_prefs_dialog()"/> <menuitem id="torbutton-about" label="&torbutton.context_menu.about;" accesskey="&torbutton.context_menu.about.key;" diff --git a/src/chrome/content/torbutton.js b/src/chrome/content/torbutton.js index 8c905d1..80c8fa6 100644 --- a/src/chrome/content/torbutton.js +++ b/src/chrome/content/torbutton.js @@ -19,6 +19,10 @@ var m_tb_ff35 = false; var m_tb_ff36 = false; var m_tb_ff4 = false; +var m_tb_control_port = null; +var m_tb_control_host = null; +var m_tb_control_pass = null; + var torbutton_window_pref_observer = { register: function() @@ -382,10 +386,10 @@ function torbutton_toggle(force) { if (torbutton_check_status()) { // Close on toggle before actually changing proxy settings // as additional safety precaution - torbutton_close_on_toggle(false); + torbutton_close_on_toggle(false, false); torbutton_disable_tor(); } else { - torbutton_close_on_toggle(true); + torbutton_close_on_toggle(true, false); torbutton_enable_tor(false); } } @@ -482,6 +486,23 @@ function torbutton_init() { m_tb_ff36 = false; } + var environ = Components.classes["@mozilla.org/process/environment;1"] + .getService(Components.interfaces.nsIEnvironment); + + if (environ.exists("TOR_CONTROL_PASSWD")) { + m_tb_control_pass = environ.get("TOR_CONTROL_PASSWD"); + } + + if (environ.exists("TOR_CONTROL_PORT")) { + m_tb_control_port = environ.get("TOR_CONTROL_PORT"); + } + + if (environ.exists("TOR_CONTROL_HOST")) { + m_tb_control_host = environ.get("TOR_CONTROL_HOST"); + } else { + m_tb_control_host = "127.0.0.1"; + } + // initialize preferences before we start our prefs observer torbutton_init_prefs(); @@ -631,6 +652,9 @@ function torbutton_open_link_as_tor(tabFlag) { mainWindow.open(myURI.spec); } + + + // this function duplicates a lot of code in preferences.js for deciding our // recommended settings. figure out a way to eliminate the redundancy. // TODO: Move it to torbutton_util.js? @@ -1190,6 +1214,209 @@ function torbutton_set_uagent() { } } +function torbutton_socket_readline(input) { + var str = ""; + var bytes; + while((bytes = input.readBytes(1)) != "\n") { + str += bytes; + } + return str; +} + +// Executes a command on the control port. +// Return 0 in error, 1 for success. +function torbutton_send_ctrl_cmd(command) { + try { + var socketTransportService = Components.classes["@mozilla.org/network/socket-transport-service;1"] + .getService(Components.interfaces.nsISocketTransportService); + var socket = socketTransportService.createTransport(null, 0, m_tb_control_host, m_tb_control_port, null); + var input = socket.openInputStream(3, 0, 0); // 3 == OPEN_BLOCKING|OPEN_UNBUFFERED + var output = socket.openOutputStream(3, 0, 0); // 3 == OPEN_BLOCKING|OPEN_UNBUFFERED + + inputStream = Cc["@mozilla.org/binaryinputstream;1"].createInstance(Ci.nsIBinaryInputStream); + outputStream = Cc["@mozilla.org/binaryoutputstream;1"].createInstance(Ci.nsIBinaryOutputStream); + + inputStream.setInputStream(input); + outputStream.setOutputStream(output); + + var auth_cmd = "AUTHENTICATE "+m_tb_control_pass+"\r\n"; + outputStream.writeBytes(auth_cmd, auth_cmd.length); + + var bytes = torbutton_socket_readline(inputStream); + + if (bytes.indexOf("250") != 0) { + torbutton_safelog(4, "Unexpected auth response on control port "+m_tb_control_port+":", bytes); + return 0; + } + + outputStream.writeBytes(command, command.length); + bytes = torbutton_socket_readline(inputStream); + if(bytes.indexOf("250") != 0) { + torbutton_safelog(4, "Unexpected command response on control port "+m_tb_control_port+":", bytes); + return 0; + } + + socket.close(1); + return 1; + } catch(e) { + torbutton_log(4, "Exception on control port "+e); + return 0; + } +} + +/* The "New Identity" implementation does the following: + * 1. Tag all tabs as non-tor + * 2. Disables Javascript and plugins on all tabs + * 3. Clears state: + * a. OCSP + * b. Cache + * c. Site-specific zoom + * d. Cookies+DOM Storage+safe browsing key + * e. google wifi geolocation token + * f. http auth + * g. SSL Session IDs + * h. last open location url + * 4. Sends tor the NEWNYM signal to get a new circuit + * + * XXX: intermediate SSL certificates are not cleared. + */ +function torbutton_new_identity() { + var wm = Components.classes["@mozilla.org/appshell/window-mediator;1"] + .getService(Components.interfaces.nsIWindowMediator); + var enumerator = wm.getEnumerator("navigator:browser"); + var closeWins = new Array(); + while(enumerator.hasMoreElements()) { + var win = enumerator.getNext(); + var browser = win.getBrowser(); + if(!browser) { + torbutton_log(5, "No browser for possible closed window"); + continue; + } + var tabs = browser.browsers.length; + + torbutton_log(3, "Length: "+browser.browsers.length); + + for(var i = 0; i < tabs; i++) { + torbutton_apply_tab_tag(browser.browsers[i], false); + } + } + + torbutton_toggle_jsplugins(true, true, true); + + m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", + !m_tb_prefs.getBoolPref("browser.zoom.siteSpecific")); + m_tb_prefs.setBoolPref("browser.zoom.siteSpecific", + !m_tb_prefs.getBoolPref("browser.zoom.siteSpecific")); + + if(m_tb_ff35) { + try { + if(m_tb_prefs.prefHasUserValue("geo.wifi.access_token")) { + m_tb_prefs.clearUserPref("geo.wifi.access_token"); + } + } catch(e) { + torbutton_log(3, "Exception on wifi token clear: "+e); + } + } + + try { + if(m_tb_prefs.prefHasUserValue("general.open_location.last_url")) { + m_tb_prefs.clearUserPref("general.open_location.last_url"); + } + } catch(e) { + torbutton_log(3, "Exception on wifi token clear: "+e); + } + + torbutton_close_on_toggle(true, true); + + if(m_tb_prefs.getBoolPref('extensions.torbutton.clear_http_auth')) { + var auth = Components.classes["@mozilla.org/network/http-auth-manager;1"]. + getService(Components.interfaces.nsIHttpAuthManager); + auth.clearAll(); + } + + try { + var secMgr = Cc["@mozilla.org/security/crypto;1"]. + getService(Ci.nsIDOMCrypto); + secMgr.logout(); + torbutton_log(3, "nsIDOMCrypto logout succeeded"); + } catch(e) { + torbutton_log(4, "Failed to use nsIDOMCrypto to clear SSL Session ids. Falling back to old method. Error: "+e); + + // This clears the SSL Identifier Cache. + // See https://bugzilla.mozilla.org/show_bug.cgi?id=448747 and + // http://mxr.mozilla.org/security/source/security/manager/ssl/src/nsNSSCompon… + m_tb_prefs.setBoolPref("security.enable_ssl2", + !m_tb_prefs.getBoolPref("security.enable_ssl2")); + m_tb_prefs.setBoolPref("security.enable_ssl2", + !m_tb_prefs.getBoolPref("security.enable_ssl2")); + } + + // This clears the OCSP cache. + // + // nsNSSComponent::Observe() watches security.OCSP.enabled, which calls + // setOCSPOptions(), which if set to 0, calls CERT_DisableOCSPChecking(), + // which calls CERT_ClearOCSPCache(). + // See: http://mxr.mozilla.org/security/source/security/manager/ssl/src/nsNSSCompon… + var ocsp = m_tb_prefs.getIntPref("security.OCSP.enabled"); + m_tb_prefs.setIntPref("security.OCSP.enabled", 0); + m_tb_prefs.setIntPref("security.OCSP.enabled", ocsp); + + // This clears the STS cache and site permissions on Tor Browser + // XXX: Tie to some kind of disk-ok pref? + try { + m_tb_prefs.setBoolPref('permissions.memory_only', false); + m_tb_prefs.setBoolPref('permissions.memory_only', true); + } catch(e) { + // Actually, this catch does not appear to be needed. Leaving it in for + // safety though. + torbutton_log(3, "Can't clear STS/Permissions: Not Tor Browser: "+e); + } + + // This clears the undo tab history. + var tabs = m_tb_prefs.getIntPref("browser.sessionstore.max_tabs_undo"); + m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", 0); + m_tb_prefs.setIntPref("browser.sessionstore.max_tabs_undo", tabs); + + var cache = Components.classes["@mozilla.org/network/cache-service;1"]. + getService(Components.interfaces.nsICacheService); + try { + cache.evictEntries(0); + } catch(e) { + torbutton_log(5, "Exception on cache clearing: "+e); + } + + if (m_tb_prefs.getBoolPref('extensions.torbutton.cookie_protections')) { + var selector = Components.classes["@torproject.org/cookie-jar-selector;1"] + .getService(Components.interfaces.nsISupports) + .wrappedJSObject; + // This emits "cookie-changed", "cleared", which kills DOM storage + // and the safe browsing API key + selector.clearUnprotectedCookies("tor"); + } else { + torbutton_clear_cookies(); + } + + // Force prefs to be synced to disk + var prefService = Components.classes["@mozilla.org/preferences-service;1"] + .getService(Components.interfaces.nsIPrefService); + prefService.savePrefFile(null); + + // We only support TBB for newnym. + if (!m_tb_control_pass || !m_tb_control_port) { + var o_stringbundle = torbutton_get_stringbundle(); + var warning = o_stringbundle.GetStringFromName("torbutton.popup.no_newnym"); + torbutton_log(5, "Torbutton cannot safely newnym. It does not have access to the Tor Control Port."); + window.alert(warning); + } else { + if(torbutton_send_ctrl_cmd("SIGNAL NEWNYM\r\n") == 0) { + torbutton_log(5, "Torbutton was unable to request a new circuit from Tor"); + } + } + + torbutton_log(3, "New identity successful"); + +} + // NOTE: If you touch any additional prefs in here, be sure to update // the list in torbutton_util.js::torbutton_reset_browser_prefs() @@ -1565,7 +1792,7 @@ function torbutton_update_status(mode, force_update) { torbutton_set_timezone(mode, false); // This call also has to be here for 3rd party proxy changers. - torbutton_close_on_toggle(mode); + torbutton_close_on_toggle(mode, false); if(m_tb_prefs.getBoolPref('extensions.torbutton.clear_http_auth')) { var auth = Components.classes["@mozilla.org/network/http-auth-manager;1"]. @@ -1668,11 +1895,16 @@ function torbutton_update_status(mode, force_update) { torbutton_log(3, "Settings applied for mode: "+mode); } -function torbutton_close_on_toggle(mode) { +function torbutton_close_on_toggle(mode, newnym) { var close_tor = m_tb_prefs.getBoolPref("extensions.torbutton.close_tor"); var close_nontor = m_tb_prefs.getBoolPref("extensions.torbutton.close_nontor"); + var close_newnym = m_tb_prefs.getBoolPref("extensions.torbutton.close_newnym"); - if((!close_tor && !mode) || (mode && !close_nontor)) { + if (newnym) { + if (!close_newnym) { + torbutton_log(3, "Not closing tabs"); + } + } else if((mode && !close_nontor) || (!mode && !close_tor)) { torbutton_log(3, "Not closing tabs"); return; } @@ -1730,6 +1962,9 @@ function torbutton_check_protections() var locked_pref = m_tb_prefs.getBoolPref("extensions.torbutton.locked_mode") document.getElementById("torbutton-cookie-protector").disabled = !cookie_pref; document.getElementById("torbutton-toggle").collapsed = locked_pref; + + if (!m_tb_control_pass || !m_tb_control_port) + document.getElementById("torbutton-new-identity").disabled = true; } function torbutton_open_cookie_dialog() { diff --git a/src/chrome/locale/en/torbutton.dtd b/src/chrome/locale/en/torbutton.dtd index 0da56d5..551cd5b 100644 --- a/src/chrome/locale/en/torbutton.dtd +++ b/src/chrome/locale/en/torbutton.dtd @@ -27,6 +27,8 @@ <!ENTITY torbutton.pref_connection.more_info "More information"> <!ENTITY torbutton.pref_connection_more_info.title "Help"> <!ENTITY torbutton.pref_connection_more_info.text "Torbutton is currently enabled. If you would like to change your non-Tor proxy settings, please disable Torbutton and return here. If you would like to change your Tor settings, please use the Torbutton preference window."> +<!ENTITY torbutton.context_menu.new_identity "New Identity"> +<!ENTITY torbutton.context_menu.new_identity_key "I"> <!ENTITY torbutton.context_menu.toggle "Toggle Tor status"> <!ENTITY torbutton.context_menu.toggle.key "T"> <!ENTITY torbutton.context_menu.preferences "Preferences..."> diff --git a/src/chrome/locale/en/torbutton.properties b/src/chrome/locale/en/torbutton.properties index 2399f53..6ff74d7 100644 --- a/src/chrome/locale/en/torbutton.properties +++ b/src/chrome/locale/en/torbutton.properties @@ -35,3 +35,4 @@ torbutton.popup.captcha.always = Always perform this action from now on torbutton.popup.redirect = Redirect torbutton.popup.no_redirect = Don't Redirect torbutton.popup.prompted_language = To give you more privacy, Torbutton can request the English language version of web pages. This may cause web pages that you prefer to read in your native language to display in English instead.\n\nWould you like to request English language web pages for better privacy? +torbutton.popup.no_newnym = Torbutton cannot safely give you a new identity. It does not have access to the Tor Control Port.\n\nAre you running Tor Browser Bundle? diff --git a/src/components/cookie-jar-selector.js b/src/components/cookie-jar-selector.js index 4094a15..5c5011a 100644 --- a/src/components/cookie-jar-selector.js +++ b/src/components/cookie-jar-selector.js @@ -396,6 +396,10 @@ function CookieJarSelector() { } protcookie = false; } + // Emit cookie-changed event. This instructs other components to clear their identifiers + // (Specifically DOM storage and safe browsing, but possibly others) + var obsSvc = Components.classes["@mozilla.org/observer-service;1"].getService(nsIObserverService); + obsSvc.notifyObservers(this, "cookie-changed", "cleared"); } catch (e) { this.logger.log(3, "Error deleting unprotected cookies: " + e); } diff --git a/src/defaults/preferences/preferences.js b/src/defaults/preferences/preferences.js index efca607..ecb74a0 100644 --- a/src/defaults/preferences/preferences.js +++ b/src/defaults/preferences/preferences.js @@ -147,6 +147,7 @@ pref("extensions.torbutton.block_ntforms",false); pref("extensions.torbutton.clear_http_auth",true); pref("extensions.torbutton.close_tor",false); pref("extensions.torbutton.close_nontor",false); +pref("extensions.torbutton.close_newnym",true); pref("extensions.torbutton.block_js_history",true); pref("extensions.torbutton.resize_on_toggle",true); pref("extensions.torbutton.resize_new_windows",true);

1 0

[arm/master] fix: failing fingerprint lookups when DirPort
by atagar＠torproject.org 15 Aug '11

15 Aug '11

commit 05b308a560ba4f0ff047db42939dc7b69c58b547 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Aug 13 15:21:08 2011 -0700 fix: failing fingerprint lookups when DirPort Inbound and outbound connection types were assuming that the ports they were connected to was a relay's ORPort and using this to narrow results in fingerprint lookups. However, we could be attached to a relay's DirPort in which case the lookup failed (but when pressing enter there was only a single possible relay result). Instead only using the port to narrow the results when there's multiple matches. --- src/cli/connections/connEntry.py | 19 ++++++++++++------- 1 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/cli/connections/connEntry.py b/src/cli/connections/connEntry.py index 0c82495..075dfb2 100644 --- a/src/cli/connections/connEntry.py +++ b/src/cli/connections/connEntry.py @@ -55,9 +55,10 @@ class Endpoint: self.ipAddr = ipAddr self.port = port - # if true, we treat the port as an ORPort when searching for matching - # fingerprints (otherwise the ORPort is assumed to be unknown) - self.isORPort = False + # if true, we treat the port as an definitely not being an ORPort when + # searching for matching fingerprints (otherwise we use it to possably + # narrow results when unknown) + self.isNotORPort = True # if set then this overwrites fingerprint lookups self.fingerprintOverwrite = None @@ -119,8 +120,12 @@ class Endpoint: return self.fingerprintOverwrite conn = torTools.getConn() - orPort = self.port if self.isORPort else None - myFingerprint = conn.getRelayFingerprint(self.ipAddr, orPort) + myFingerprint = conn.getRelayFingerprint(self.ipAddr) + + # If there were multiple matches and our port is likely the ORPort then + # try again with that to narrow the results. + if not myFingerprint and not self.isNotORPort: + myFingerprint = conn.getRelayFingerprint(self.ipAddr, self.port) if myFingerprint: return myFingerprint else: return "UNKNOWN" @@ -226,7 +231,7 @@ class ConnectionLine(entries.ConnectionPanelLine): if lPort in (myOrPort, myDirPort): self.baseType = Category.INBOUND - self.local.isORPort = True + self.local.isNotORPort = False elif lPort == mySocksPort: self.baseType = Category.SOCKS elif fPort in myHiddenServicePorts: @@ -235,7 +240,7 @@ class ConnectionLine(entries.ConnectionPanelLine): self.baseType = Category.CONTROL else: self.baseType = Category.OUTBOUND - self.foreign.isORPort = True + self.foreign.isNotORPort = False self.cachedType = None

1 0

[arm/master] Rewrite of the descriptor popup dialog
by atagar＠torproject.org 15 Aug '11

15 Aug '11

commit 9b9ea8e1d247ef5290ab730cf7a88d76d94d8f02 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Aug 15 10:11:00 2011 -0700 Rewrite of the descriptor popup dialog For a time I'd been planning to drop the descriptor popup from the codebase. However, it's fairly useful so cleaning up the code and keeping it. This is functionally equivilant except that it's a bit simpler and has minor performance improvements. --- README | 10 +- src/cli/__init__.py | 2 +- src/cli/connections/__init__.py | 2 +- src/cli/connections/connPanel.py | 14 ++- src/cli/connections/descriptorPopup.py | 229 ++++++++++++++++++++++++++++++++ src/cli/descriptorPopup.py | 216 ------------------------------ src/util/panel.py | 2 + 7 files changed, 248 insertions(+), 227 deletions(-) diff --git a/README b/README index 2e0bd6e..119d24e 100644 --- a/README +++ b/README @@ -171,10 +171,11 @@ Layout: connections/ __init__.py - connPanel.py - (page 2) lists the active tor connections - circEntry.py - circuit entries in the connection panel - connEntry.py - individual connections to or from the system - entries.py - common parent for connPanel display entries + connPanel.py - (page 2) lists the active tor connections + circEntry.py - circuit entries in the connection panel + connEntry.py - individual connections to or from the system + descriptorPopup.py - displays raw descriptor and consensus entries + entries.py - common parent for connPanel display entries menu/ __init__.py @@ -185,7 +186,6 @@ Layout: __init__.py controller.py - main display loop, handling input and layout headerPanel.py - top of all pages, providing general information - descriptorPopup.py - displays connection descriptor data popups.py - toolkit providing display popups wizard.py - provides the relay setup wizard diff --git a/src/cli/__init__.py b/src/cli/__init__.py index 435883d..b0d6bd8 100644 --- a/src/cli/__init__.py +++ b/src/cli/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["configPanel", "controller", "descriptorPopup", "headerPanel", "logPanel", "popups", "torrcPanel", "wizard"] +__all__ = ["configPanel", "controller", "headerPanel", "logPanel", "popups", "torrcPanel", "wizard"] diff --git a/src/cli/connections/__init__.py b/src/cli/connections/__init__.py index 5babdde..0f29d23 100644 --- a/src/cli/connections/__init__.py +++ b/src/cli/connections/__init__.py @@ -2,5 +2,5 @@ Connection panel related resources. """ -__all__ = ["circEntry", "connEntry", "connPanel", "entries"] +__all__ = ["circEntry", "connEntry", "connPanel", "descriptorPopup", "entries"] diff --git a/src/cli/connections/connPanel.py b/src/cli/connections/connPanel.py index 705fd77..923902c 100644 --- a/src/cli/connections/connPanel.py +++ b/src/cli/connections/connPanel.py @@ -6,10 +6,9 @@ import time import curses import threading -import cli.descriptorPopup import cli.popups -from cli.connections import entries, connEntry, circEntry +from cli.connections import descriptorPopup, entries, connEntry, circEntry from util import connections, enum, panel, torTools, uiTools DEFAULT_CONFIG = {"features.connection.resolveApps": True, @@ -214,7 +213,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): if selection != -1: self.setListingType(options[selection]) elif key == ord('d') or key == ord('D'): # presents popup for raw consensus data - cli.descriptorPopup.showDescriptorPopup(self) + descriptorPopup.showDescriptorPopup(self) else: isKeystrokeConsumed = False self.valsLock.release() @@ -269,6 +268,13 @@ class ConnectionPanel(panel.Panel, threading.Thread): options.append(("u", "resolving utility", resolverUtil)) return options + def getSelection(self): + """ + Provides the currently selected connection entry. + """ + + return self._scroller.getCursorSelection(self._entryLines) + def draw(self, width, height): self.valsLock.acquire() @@ -280,7 +286,7 @@ class ConnectionPanel(panel.Panel, threading.Thread): isScrollbarVisible = len(self._entryLines) > height - detailPanelOffset - 1 scrollLoc = self._scroller.getScrollLoc(self._entryLines, height - detailPanelOffset - 1) - cursorSelection = self._scroller.getCursorSelection(self._entryLines) + cursorSelection = self.getSelection() # draws the detail panel if currently displaying it if self._showDetails and cursorSelection: diff --git a/src/cli/connections/descriptorPopup.py b/src/cli/connections/descriptorPopup.py new file mode 100644 index 0000000..eed213f --- /dev/null +++ b/src/cli/connections/descriptorPopup.py @@ -0,0 +1,229 @@ +""" +Popup providing the raw descriptor and consensus information for a relay. +""" + +import math +import curses + +import cli.popups +import cli.connections.connEntry + +from util import panel, torTools, uiTools + +# field keywords used to identify areas for coloring +LINE_NUM_COLOR = "yellow" +HEADER_COLOR = "cyan" +HEADER_PREFIX = ["ns/id/", "desc/id/"] + +SIG_COLOR = "red" +SIG_START_KEYS = ["-----BEGIN RSA PUBLIC KEY-----", "-----BEGIN SIGNATURE-----"] +SIG_END_KEYS = ["-----END RSA PUBLIC KEY-----", "-----END SIGNATURE-----"] + +UNRESOLVED_MSG = "No consensus data available" +ERROR_MSG = "Unable to retrieve data" + +def showDescriptorPopup(connPanel): + """ + Presents consensus descriptor in popup window with the following controls: + Up, Down, Page Up, Page Down - scroll descriptor + Right, Left - next / previous connection + Enter, Space, d, D - close popup + + Arguments: + connPanel - connection panel providing the dialog + """ + + # hides the title of the connection panel + connPanel.setTitleVisible(False) + connPanel.redraw(True) + + control = cli.controller.getController() + panel.CURSES_LOCK.acquire() + isDone = False + + try: + while not isDone: + selection = connPanel.getSelection() + if not selection: break + + fingerprint = selection.foreign.getFingerprint() + if fingerprint == "UNKNOWN": fingerprint = None + + displayText = getDisplayText(fingerprint) + displayColor = cli.connections.connEntry.CATEGORY_COLOR[selection.getType()] + showLineNumber = fingerprint != None + + # determines the maximum popup size the displayText can fill + pHeight, pWidth = getPreferredSize(displayText, connPanel.maxX, showLineNumber) + + popup, _, height = cli.popups.init(pHeight, pWidth) + if not popup: break + scroll, isChanged = 0, True + + try: + while not isDone: + if isChanged: + draw(popup, fingerprint, displayText, displayColor, scroll, showLineNumber) + isChanged = False + + key = control.getScreen().getch() + + if uiTools.isScrollKey(key): + # TODO: This is a bit buggy in that scrolling is by displayText + # lines rather than the displayed lines, causing issues when + # content wraps. The result is that we can't have a scrollbar and + # can't scroll to the bottom if there's a multi-line being + # displayed. However, trying to correct this introduces a big can + # of worms and after hours decided that this isn't worth the + # effort... + + newScroll = uiTools.getScrollPosition(key, scroll, height - 2, len(displayText)) + + if scroll != newScroll: + scroll, isChanged = newScroll, True + elif uiTools.isSelectionKey(key) or key in (ord('d'), ord('D')): + isDone = True # closes popup + elif key in (curses.KEY_LEFT, curses.KEY_RIGHT): + # navigation - pass on to connPanel and recreate popup + connPanel.handleKey(curses.KEY_UP if key == curses.KEY_LEFT else curses.KEY_DOWN) + break + finally: cli.popups.finalize() + finally: + connPanel.setTitleVisible(True) + connPanel.redraw(True) + panel.CURSES_LOCK.release() + +def getDisplayText(fingerprint): + """ + Provides the descriptor and consensus entry for a relay. This is a list of + lines to be displayed by the dialog. + """ + + if not fingerprint: return [UNRESOLVED_MSG] + conn, description = torTools.getConn(), [] + + description.append("ns/id/%s" % fingerprint) + consensusEntry = conn.getConsensusEntry(fingerprint) + + if consensusEntry: description += consensusEntry.split("\n") + else: description += [ERROR_MSG, ""] + + description.append("desc/id/%s" % fingerprint) + descriptorEntry = conn.getDescriptorEntry(fingerprint) + + if descriptorEntry: description += descriptorEntry.split("\n") + else: description += [ERROR_MSG] + + return description + +def getPreferredSize(text, maxWidth, showLineNumber): + """ + Provides the (height, width) tuple for the preferred size of the given text. + """ + + width, height = 0, len(text) + 2 + lineNumWidth = int(math.log10(len(text))) + 1 + for line in text: + # width includes content, line number field, and border + lineWidth = len(line) + 5 + if showLineNumber: lineWidth += lineNumWidth + width = max(width, lineWidth) + + # tracks number of extra lines that will be taken due to text wrap + height += (lineWidth - 2) / maxWidth + + return (height, width) + +def draw(popup, fingerprint, displayText, displayColor, scroll, showLineNumber): + popup.win.erase() + popup.win.box() + xOffset = 2 + + if fingerprint: title = "Consensus Descriptor (%s):" % fingerprint + else: title = "Consensus Descriptor:" + popup.addstr(0, 0, title, curses.A_STANDOUT) + + lineNumWidth = int(math.log10(len(displayText))) + 1 + isEncryptionBlock = False # flag indicating if we're currently displaying a key + + # checks if first line is in an encryption block + for i in range(0, scroll): + lineText = displayText[i].strip() + if lineText in SIG_START_KEYS: isEncryptionBlock = True + elif lineText in SIG_END_KEYS: isEncryptionBlock = False + + drawLine, pageHeight = 1, popup.maxY - 2 + for i in range(scroll, scroll + pageHeight): + lineText = displayText[i].strip() + xOffset = 2 + + if showLineNumber: + lineNumLabel = ("%%%ii" % lineNumWidth) % (i + 1) + lineNumFormat = curses.A_BOLD | uiTools.getColor(LINE_NUM_COLOR) + + popup.addstr(drawLine, xOffset, lineNumLabel, lineNumFormat) + xOffset += lineNumWidth + 1 + + # Most consensus and descriptor lines are keyword/value pairs. Both are + # shown with the same color, but the keyword is bolded. + + keyword, value = lineText, "" + drawFormat = uiTools.getColor(displayColor) + + if lineText.startswith(HEADER_PREFIX[0]) or lineText.startswith(HEADER_PREFIX[1]): + keyword, value = lineText, "" + drawFormat = uiTools.getColor(HEADER_COLOR) + elif lineText == UNRESOLVED_MSG or lineText == ERROR_MSG: + keyword, value = lineText, "" + elif lineText in SIG_START_KEYS: + keyword, value = lineText, "" + isEncryptionBlock = True + drawFormat = uiTools.getColor(SIG_COLOR) + elif lineText in SIG_END_KEYS: + keyword, value = lineText, "" + isEncryptionBlock = False + drawFormat = uiTools.getColor(SIG_COLOR) + elif isEncryptionBlock: + keyword, value = "", lineText + drawFormat = uiTools.getColor(SIG_COLOR) + elif " " in lineText: + divIndex = lineText.find(" ") + keyword, value = lineText[:divIndex], lineText[divIndex:] + + displayQueue = [(keyword, drawFormat | curses.A_BOLD), (value, drawFormat)] + cursorLoc = xOffset + + while displayQueue: + msg, format = displayQueue.pop(0) + if not msg: continue + + maxMsgSize = popup.maxX - 1 - cursorLoc + if len(msg) >= maxMsgSize: + # needs to split up the line + msg, remainder = uiTools.cropStr(msg, maxMsgSize, None, endType = None, getRemainder = True) + + if xOffset == cursorLoc and msg == "": + # first word is longer than the line + msg = uiTools.cropStr(remainder, maxMsgSize) + + if " " in remainder: + remainder = remainder.split(" ", 1)[1] + else: remainder = "" + + popup.addstr(drawLine, cursorLoc, msg, format) + cursorLoc = xOffset + + if remainder: + displayQueue.insert(0, (remainder.strip(), format)) + drawLine += 1 + else: + popup.addstr(drawLine, cursorLoc, msg, format) + cursorLoc += len(msg) + + if drawLine > pageHeight: break + + drawLine += 1 + if drawLine > pageHeight: break + + popup.win.refresh() + diff --git a/src/cli/descriptorPopup.py b/src/cli/descriptorPopup.py deleted file mode 100644 index 5b9f646..0000000 --- a/src/cli/descriptorPopup.py +++ /dev/null @@ -1,216 +0,0 @@ -#!/usr/bin/env python -# descriptorPopup.py -- popup panel used to show raw consensus data -# Released under the GPL v3 (http://www.gnu.org/licenses/gpl.html) - -import math -import curses - -import controller -import connections.connEntry -import popups -from util import panel, torTools, uiTools - -# field keywords used to identify areas for coloring -LINE_NUM_COLOR = "yellow" -HEADER_COLOR = "cyan" -HEADER_PREFIX = ["ns/id/", "desc/id/"] - -SIG_COLOR = "red" -SIG_START_KEYS = ["-----BEGIN RSA PUBLIC KEY-----", "-----BEGIN SIGNATURE-----"] -SIG_END_KEYS = ["-----END RSA PUBLIC KEY-----", "-----END SIGNATURE-----"] - -UNRESOLVED_MSG = "No consensus data available" -ERROR_MSG = "Unable to retrieve data" - -def addstr_wrap(panel, y, x, text, formatting, startX = 0, endX = -1, maxY = -1): - """ - Writes text with word wrapping, returning the ending y/x coordinate. - y: starting write line - x: column offset from startX - text / formatting: content to be written - startX / endX: column bounds in which text may be written - """ - - # moved out of panel (trying not to polute new code!) - # TODO: unpleaseantly complex usage - replace with something else when - # rewriting confPanel and descriptorPopup (the only places this is used) - if not text: return (y, x) # nothing to write - if endX == -1: endX = panel.maxX # defaults to writing to end of panel - if maxY == -1: maxY = panel.maxY + 1 # defaults to writing to bottom of panel - lineWidth = endX - startX # room for text - while True: - if len(text) > lineWidth - x - 1: - chunkSize = text.rfind(" ", 0, lineWidth - x) - writeText = text[:chunkSize] - text = text[chunkSize:].strip() - - panel.addstr(y, x + startX, writeText, formatting) - y, x = y + 1, 0 - if y >= maxY: return (y, x) - else: - panel.addstr(y, x + startX, text, formatting) - return (y, x + len(text)) - -class PopupProperties: - """ - State attributes of popup window for consensus descriptions. - """ - - def __init__(self): - self.fingerprint = "" - self.entryColor = "white" - self.text = [] - self.scroll = 0 - self.showLineNum = True - - def reset(self, fingerprint, entryColor): - self.fingerprint = fingerprint - self.entryColor = entryColor - self.text = [] - self.scroll = 0 - - if fingerprint == "UNKNOWN": - self.fingerprint = None - self.showLineNum = False - self.text.append(UNRESOLVED_MSG) - else: - conn = torTools.getConn() - self.showLineNum = True - - self.text.append("ns/id/%s" % fingerprint) - consensusEntry = conn.getConsensusEntry(fingerprint) - - if consensusEntry: self.text += consensusEntry.split("\n") - else: self.text = self.text + [ERROR_MSG, ""] - - self.text.append("desc/id/%s" % fingerprint) - descriptorEntry = conn.getDescriptorEntry(fingerprint) - - if descriptorEntry: self.text += descriptorEntry.split("\n") - else: self.text = self.text + [ERROR_MSG] - - def handleKey(self, key, height): - if key == curses.KEY_UP: self.scroll = max(self.scroll - 1, 0) - elif key == curses.KEY_DOWN: self.scroll = max(0, min(self.scroll + 1, len(self.text) - height)) - elif key == curses.KEY_PPAGE: self.scroll = max(self.scroll - height, 0) - elif key == curses.KEY_NPAGE: self.scroll = max(0, min(self.scroll + height, len(self.text) - height)) - -def showDescriptorPopup(connectionPanel): - """ - Presents consensus descriptor in popup window with the following controls: - Up, Down, Page Up, Page Down - scroll descriptor - Right, Left - next / previous connection - Enter, Space, d, D - close popup - """ - - # hides the title of the first panel on the page - control = controller.getController() - topPanel = control.getDisplayPanels(includeSticky = False)[0] - topPanel.setTitleVisible(False) - topPanel.redraw(True) - - properties = PopupProperties() - isVisible = True - - panel.CURSES_LOCK.acquire() - - try: - while isVisible: - selection = connectionPanel._scroller.getCursorSelection(connectionPanel._entryLines) - if not selection: break - fingerprint = selection.foreign.getFingerprint() - entryColor = connections.connEntry.CATEGORY_COLOR[selection.getType()] - properties.reset(fingerprint, entryColor) - - # constrains popup size to match text - width, height = 0, 0 - for line in properties.text: - # width includes content, line number field, and border - lineWidth = len(line) + 5 - if properties.showLineNum: lineWidth += int(math.log10(len(properties.text))) + 1 - width = max(width, lineWidth) - - # tracks number of extra lines that will be taken due to text wrap - height += (lineWidth - 2) / connectionPanel.maxX - - while isVisible: - popupHeight = min(len(properties.text) + height + 2, connectionPanel.maxY) - popup, _, _ = popups.init(popupHeight, width) - if not popup: break - - try: - draw(popup, properties) - key = control.getScreen().getch() - - if uiTools.isSelectionKey(key) or key in (ord('d'), ord('D')): - # closes popup - isVisible = False - elif key in (curses.KEY_LEFT, curses.KEY_RIGHT): - # navigation - pass on to connPanel and recreate popup - connectionPanel.handleKey(curses.KEY_UP if key == curses.KEY_LEFT else curses.KEY_DOWN) - break - else: properties.handleKey(key, popup.height - 2) - finally: popups.finalize() - finally: panel.CURSES_LOCK.release() - - topPanel.setTitleVisible(True) - -def draw(popup, properties): - popup.win.erase() - popup.win.box() - xOffset = 2 - - if properties.text: - if properties.fingerprint: popup.addstr(0, 0, "Consensus Descriptor (%s):" % properties.fingerprint, curses.A_STANDOUT) - else: popup.addstr(0, 0, "Consensus Descriptor:", curses.A_STANDOUT) - - isEncryption = False # true if line is part of an encryption block - - # checks if first line is in an encryption block - for i in range(0, properties.scroll): - lineText = properties.text[i].strip() - if lineText in SIG_START_KEYS: isEncryption = True - elif lineText in SIG_END_KEYS: isEncryption = False - - pageHeight = popup.maxY - 2 - numFieldWidth = int(math.log10(len(properties.text))) + 1 - lineNum = 1 - for i in range(properties.scroll, min(len(properties.text), properties.scroll + pageHeight)): - lineText = properties.text[i].strip() - - numOffset = 0 # offset for line numbering - if properties.showLineNum: - popup.addstr(lineNum, xOffset, ("%%%ii" % numFieldWidth) % (i + 1), curses.A_BOLD | uiTools.getColor(LINE_NUM_COLOR)) - numOffset = numFieldWidth + 1 - - if lineText: - keyword = lineText.split()[0] # first word of line - remainder = lineText[len(keyword):] - keywordFormat = curses.A_BOLD | uiTools.getColor(properties.entryColor) - remainderFormat = uiTools.getColor(properties.entryColor) - - if lineText.startswith(HEADER_PREFIX[0]) or lineText.startswith(HEADER_PREFIX[1]): - keyword, remainder = lineText, "" - keywordFormat = curses.A_BOLD | uiTools.getColor(HEADER_COLOR) - if lineText == UNRESOLVED_MSG or lineText == ERROR_MSG: - keyword, remainder = lineText, "" - if lineText in SIG_START_KEYS: - keyword, remainder = lineText, "" - isEncryption = True - keywordFormat = curses.A_BOLD | uiTools.getColor(SIG_COLOR) - elif lineText in SIG_END_KEYS: - keyword, remainder = lineText, "" - isEncryption = False - keywordFormat = curses.A_BOLD | uiTools.getColor(SIG_COLOR) - elif isEncryption: - keyword, remainder = lineText, "" - keywordFormat = uiTools.getColor(SIG_COLOR) - - lineNum, xLoc = addstr_wrap(popup, lineNum, 0, keyword, keywordFormat, xOffset + numOffset, popup.maxX - 1, popup.maxY - 1) - lineNum, xLoc = addstr_wrap(popup, lineNum, xLoc, remainder, remainderFormat, xOffset + numOffset, popup.maxX - 1, popup.maxY - 1) - - lineNum += 1 - if lineNum > pageHeight: break - - popup.win.refresh() - diff --git a/src/util/panel.py b/src/util/panel.py index 8a95479..0e84005 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -677,6 +677,8 @@ class Panel(): for i in range(scrollbarHeight): if i >= sliderTop and i <= sliderTop + sliderSize: self.addstr(i + drawTop, drawLeft, " ", curses.A_STANDOUT) + else: + self.addstr(i + drawTop, drawLeft, " ") # draws box around the scroll bar self.vline(drawTop, drawLeft + 1, drawBottom - 1)

1 0

[tor/master] Move connection_free_all() to the bottom of connection.c to enjoy maximum visibility.
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit a5fd07d178d1260ec7073c6ea0db185b8527fc68 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 13 20:29:22 2011 +0200 Move connection_free_all() to the bottom of connection.c to enjoy maximum visibility. --- src/or/connection.c | 69 +++++++++++++++++++++++++-------------------------- 1 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index b885d09..67e9442 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -561,41 +561,6 @@ connection_free(connection_t *conn) _connection_free(conn); } -/** Call _connection_free() on every connection in our array, and release all - * storage held by connection.c. This is used by cpuworkers and dnsworkers - * when they fork, so they don't keep resources held open (especially - * sockets). - * - * Don't do the checks in connection_free(), because they will - * fail. - */ -void -connection_free_all(void) -{ - smartlist_t *conns = get_connection_array(); - - /* We don't want to log any messages to controllers. */ - SMARTLIST_FOREACH(conns, connection_t *, conn, - if (conn->type == CONN_TYPE_CONTROL) - TO_CONTROL_CONN(conn)->event_mask = 0); - - control_update_global_event_mask(); - - /* Unlink everything from the identity map. */ - connection_or_clear_identity_map(); - - /* Clear out our list of broken connections */ - clear_broken_connection_map(0); - - SMARTLIST_FOREACH(conns, connection_t *, conn, _connection_free(conn)); - - if (outgoing_addrs) { - SMARTLIST_FOREACH(outgoing_addrs, void*, addr, tor_free(addr)); - smartlist_free(outgoing_addrs); - outgoing_addrs = NULL; - } -} - /** * Called when we're about to finally unlink and free a connection: * perform necessary accounting and cleanup @@ -4163,3 +4128,37 @@ proxy_type_to_string(int proxy_type) return NULL; /*Unreached*/ } +/** Call _connection_free() on every connection in our array, and release all + * storage held by connection.c. This is used by cpuworkers and dnsworkers + * when they fork, so they don't keep resources held open (especially + * sockets). + * + * Don't do the checks in connection_free(), because they will + * fail. + */ +void +connection_free_all(void) +{ + smartlist_t *conns = get_connection_array(); + + /* We don't want to log any messages to controllers. */ + SMARTLIST_FOREACH(conns, connection_t *, conn, + if (conn->type == CONN_TYPE_CONTROL) + TO_CONTROL_CONN(conn)->event_mask = 0); + + control_update_global_event_mask(); + + /* Unlink everything from the identity map. */ + connection_or_clear_identity_map(); + + /* Clear out our list of broken connections */ + clear_broken_connection_map(0); + + SMARTLIST_FOREACH(conns, connection_t *, conn, _connection_free(conn)); + + if (outgoing_addrs) { + SMARTLIST_FOREACH(outgoing_addrs, void*, addr, tor_free(addr)); + smartlist_free(outgoing_addrs); + outgoing_addrs = NULL; + } +}

1 0

[tor/master] Free global_rate_limit in connection_free_all().
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit ec8d0a6d83adec7953839937c7fcbe315284c263 Author: George Kadianakis <desnacked(a)gmail.com> Date: Sat Aug 13 20:37:13 2011 +0200 Free global_rate_limit in connection_free_all(). --- src/or/connection.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 67e9442..2087ced 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -4161,4 +4161,9 @@ connection_free_all(void) smartlist_free(outgoing_addrs); outgoing_addrs = NULL; } + +#ifdef USE_BUFFEREVENTS + if (global_rate_limit) + bufferevent_rate_limit_group_free(global_rate_limit); +#endif }

1 0

[tor/master] Merge remote-tracking branch 'asn/bug3728'
by nickm＠torproject.org 15 Aug '11

15 Aug '11

commit 2dc40b9c49ec13ed24b5a541ce6cfecfe79effbf Merge: aeb2752 ec8d0a6 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 15 11:06:50 2011 -0400 Merge remote-tracking branch 'asn/bug3728' src/or/connection.c | 74 +++++++++++++++++++++++++++------------------------ 1 files changed, 39 insertions(+), 35 deletions(-)

1 0