commit 25921b57878c273ea4f499eb88ac2590563d9869 Author: Georg Koppen <gk@torproject.org> Date: Wed Dec 3 11:38:34 2014 +0000 fixup! #13671: fix circuit display when bridges are used --- src/chrome/content/tor-circuit-display.js | 6 +++--- src/modules/tor-control-port.js | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/chrome/content/tor-circuit-display.js b/src/chrome/content/tor-circuit-display.js index caf6886..4c31bc6 100644 --- a/src/chrome/content/tor-circuit-display.js +++ b/src/chrome/content/tor-circuit-display.js @@ -81,10 +81,10 @@ let readBridgeIPs = function (controller) { // nodeDataForID(controller, id)__. // Returns the type, IP and country code of a node with given ID. -// Example: `nodeData(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` -// => `{ type : "default" , ip : "12.23.34.45" , countryCode : "fr" }` +// Example: `nodeDataForID(controller, "20BC91DC525C3DC9974B29FBEAB51230DE024C44")` +// => `{ type : "default", ip : "12.23.34.45", countryCode : "fr" }` let nodeDataForID = function* (controller, id) { - let result = {}; // ip, type, countryCode; + let result = {}; // type, ip, countryCode; if (bridgeIDtoIPmap.has(id.toUpperCase())) { result.ip = bridgeIDtoIPmap.get(id.toUpperCase()); result.type = "bridge"; diff --git a/src/modules/tor-control-port.js b/src/modules/tor-control-port.js index d356ebb..3fa7756 100644 --- a/src/modules/tor-control-port.js +++ b/src/modules/tor-control-port.js @@ -178,7 +178,7 @@ io.onLineFromOnMessage = function (onMessage) { // __io.callbackDispatcher()__. // Returns dispatcher object with three member functions: -// dispatcher.addCallback(regex, callback), and dispatcher.removeCallback(callback), +// dispatcher.addCallback(regex, callback), dispatcher.removeCallback(callback), // and dispatcher.pushMessage(message). // Pass pushMessage to another function that needs a callback with a single string // argument. Whenever dispatcher.pushMessage receives a string, the dispatcher will @@ -412,12 +412,12 @@ info.routerStatusParser = function (valueString) { dataFun = { "r" : data => utils.listMapData(data, ["nickname", "identity", "digest", "publicationDate", "publicationTime", - "IP", "ORPort", "DirPort"]) , - "a" : data => ({ "IPv6" : data }) , - "s" : data => ({ "statusFlags" : utils.splitAtSpaces(data) }) , - "v" : data => ({ "version" : data }) , - "w" : data => utils.listMapData(data, []) , - "p" : data => ({ "portList" : data.split(",") }) , + "IP", "ORPort", "DirPort"]), + "a" : data => ({ "IPv6" : data }), + "s" : data => ({ "statusFlags" : utils.splitAtSpaces(data) }), + "v" : data => ({ "version" : data }), + "w" : data => utils.listMapData(data, []), + "p" : data => ({ "portList" : data.split(",") }), "m" : data => utils.listMapData(data, []) }[line.charAt(0)]; if (dataFun !== undefined) {