tor-commits July 2011

tor-commits@lists.torproject.org

16 participants
868 discussions

[tor/master] Make WIN32_WINNT defines conditional
by nickm＠torproject.org 15 Jul '11

15 Jul '11

commit 44cfa538731079ffd6eb5f80b2e3c19c4f8acf03 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 15 10:03:59 2011 -0400 Make WIN32_WINNT defines conditional Requested by Gisle Vanem on tor-dev. I'm not quite sure this is the right solution, but it's probably harmless. --- changes/ifdef-winnt | 4 ++++ src/common/compat.h | 4 ++++ src/common/crypto.c | 4 ++++ src/common/tortls.c | 4 ++++ src/or/or.h | 4 ++++ 5 files changed, 20 insertions(+), 0 deletions(-) diff --git a/changes/ifdef-winnt b/changes/ifdef-winnt new file mode 100644 index 0000000..2c6c5a2 --- /dev/null +++ b/changes/ifdef-winnt @@ -0,0 +1,4 @@ + o Build changes: + - On Windows, we now define the _WIN32_WINNT macros only if they + are not already defined. This lets the person building Tor decide, + if they want, to require a later version of Windows. diff --git a/src/common/compat.h b/src/common/compat.h index 094036d..98642e2 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -9,8 +9,12 @@ #include "orconfig.h" #include "torint.h" #ifdef MS_WINDOWS +#ifndef WIN32_WINNT #define WIN32_WINNT 0x400 +#endif +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 +#endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include <winsock.h> diff --git a/src/common/crypto.c b/src/common/crypto.c index 05c1ce9..9ad7575 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -13,8 +13,12 @@ #include "orconfig.h" #ifdef MS_WINDOWS +#ifndef WIN32_WINNT #define WIN32_WINNT 0x400 +#endif +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 +#endif #define WIN32_LEAN_AND_MEAN #include <windows.h> #include <wincrypt.h> diff --git a/src/common/tortls.c b/src/common/tortls.c index a208bc7..21f2c50 100644 --- a/src/common/tortls.c +++ b/src/common/tortls.c @@ -22,8 +22,12 @@ #include <assert.h> #ifdef MS_WINDOWS /*wrkard for dtls1.h >= 0.9.8m of "#include <winsock.h>"*/ + #ifndef WIN32_WINNT #define WIN32_WINNT 0x400 + #endif + #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 + #endif #define WIN32_LEAN_AND_MEAN #if defined(_MSC_VER) && (_MSC_VER < 1300) #include <winsock.h> diff --git a/src/or/or.h b/src/or/or.h index 7669efb..7a2bde5 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -23,8 +23,12 @@ #endif #ifdef MS_WINDOWS +#ifndef WIN32_WINNT #define WIN32_WINNT 0x400 +#endif +#ifndef _WIN32_WINNT #define _WIN32_WINNT 0x400 +#endif #define WIN32_LEAN_AND_MEAN #endif

1 0

r24908: {website} Stop recommending that people use bittorrent over Tor if the (website/trunk/download/en)
by Sebastian Hahn 15 Jul '11

15 Jul '11

Author: sebastian Date: 2011-07-15 12:11:40 +0000 (Fri, 15 Jul 2011) New Revision: 24908 Modified: website/trunk/download/en/download.wml Log: Stop recommending that people use bittorrent over Tor if they use TAILS Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-07-14 17:39:55 UTC (rev 24907) +++ website/trunk/download/en/download.wml 2011-07-15 12:11:40 UTC (rev 24908) @@ -337,8 +337,7 @@ <li> Do not use <a href="https://blog.torproject.org/blog/bittorrent-over-tor-isnt-good-idea">BitTorrent -and Tor</a> together unless you are using a system like <a -href="http://tails.boum.org/">TAILS</a>. +and Tor</a> together. </li> </ol> <br>

1 0

[arm/master] Removing the INCLUDE_GUI source flag
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 52852efe54e134a7fb471e5d8c89d4ee90f3ec75 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 17:49:19 2011 -0700 Removing the INCLUDE_GUI source flag It's still pretty rough but ready for some initial input. The header (renamed (as sticky), log, bandwidth graphs, and connection panels have all been implemented by Kamran. --- src/starter.py | 16 +++------------- 1 files changed, 3 insertions(+), 13 deletions(-) diff --git a/src/starter.py b/src/starter.py index 0564661..01acf24 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,7 +30,6 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil -INCLUDE_GUI = True LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None, @@ -53,12 +52,8 @@ CONFIG = {"startup.controlPassword": None, "log.configDescriptions.persistance.saveFailed": util.log.NOTICE, "log.savingDebugLog": util.log.NOTICE} -if INCLUDE_GUI: - OPT = "gi:c:dbe:vh" - OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] -else: - OPT = "i:c:dbe:vh" - OPT_EXPANDED = ["interface=", "config=", "debug", "blind", "event=", "version", "help"] +OPT = "gi:c:dbe:vh" +OPT_EXPANDED = ["gui", "interface=", "config=", "debug", "blind", "event=", "version", "help"] HELP_MSG = """Usage arm [OPTION] Terminal status monitor for Tor relays. @@ -79,11 +74,6 @@ arm -b -i 1643 hide connection data, attaching to control port 1643 arm -e we -c /tmp/cfg use this configuration file with 'WARN'/'ERR' events """ % (CONFIG["startup.interface.ipAddress"], CONFIG["startup.interface.port"], DEFAULT_CONFIG, LOG_DUMP_PATH, CONFIG["startup.events"], cli.logPanel.EVENT_LISTING) -# icky and temporary hack to remove the gui help option if it's unavailbe -if not INCLUDE_GUI: - helpComp = HELP_MSG.split("\n") - HELP_MSG = "\n".join(helpComp[:3] + helpComp[4:]) - # filename used for cached tor config descriptions CONFIG_DESC_FILENAME = "torConfigDesc.txt" @@ -310,7 +300,7 @@ if __name__ == '__main__': param["startup.interface.ipAddress"] = controlAddr param["startup.interface.port"] = controlPort - elif opt in ("-g", "--gui") and INCLUDE_GUI: launchGui = True + elif opt in ("-g", "--gui"): launchGui = True elif opt in ("-c", "--config"): configPath = arg # sets path of user's config elif opt in ("-d", "--debug"): isDebugMode = True # dumps all logs elif opt in ("-b", "--blind"):

1 0

[arm/master] Merging krkhan's master branch
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 4f3c6b69ced8b25a522f740f522a2a3aac855b5b Merge: 02be67a aef4158 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jul 14 17:42:25 2011 -0700 Merging krkhan's master branch src/gui/arm.xml | 79 ++---------------------- src/gui/connections/__init__.py | 6 ++ src/gui/connections/circEntry.py | 41 +++++++++++++ src/gui/connections/connEntry.py | 61 +++++++++++++++++++ src/gui/connections/connPanel.py | 114 +++++++++++++++++++++++++++++++++++ src/gui/controller.py | 10 +++- src/gui/graphing/graphStats.py | 15 +++-- src/gui/logPanel.py | 21 ++++-- src/gui/stickyPanel.py | 123 ++++++++++++++++++++++++++++++++++++++ src/starter.py | 2 +- src/util/gtkTools.py | 21 +++++++ 11 files changed, 406 insertions(+), 87 deletions(-)

1 0

[arm/master] Fill panels immediately at launch instead of waiting for first timeout.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit aef4158d0436449d696ad26d83b2dfd5c23505c1 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 14:15:55 2011 +0500 Fill panels immediately at launch instead of waiting for first timeout. --- src/gui/connections/connPanel.py | 10 +++++++--- src/gui/stickyPanel.py | 11 ++++++++--- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index e6a7c5b..af9bf06 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -49,11 +49,17 @@ class ConnectionPanel(CliConnectionPanel): torCmdName = sysTools.getProcessName(torPid, "tor") connections.getResolver(torCmdName, torPid, "tor") - gobject.timeout_add(3000, self._fill_entries) + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) def pack_widgets(self): pass + def _timeout_fill_entries(self): + self._fill_entries() + + return True + def _fill_entries(self): self.valsLock.acquire() @@ -106,5 +112,3 @@ class ConnectionPanel(CliConnectionPanel): self.valsLock.release() - return True - diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py index 89b5485..145c452 100644 --- a/src/gui/stickyPanel.py +++ b/src/gui/stickyPanel.py @@ -20,12 +20,19 @@ class StickyPanel(CliHeaderPanel): CliHeaderPanel.__init__(self, None, time.time()) self.builder = builder + self.filled = False - gobject.timeout_add(3000, self._fill_entries) + gobject.idle_add(self._fill_entries) + gobject.timeout_add(3000, self._timeout_fill_entries) def pack_widgets(self): pass + def _timeout_fill_entries(self): + self._fill_entries() + + return True + def _fill_entries(self): self.valsLock.acquire() @@ -114,5 +121,3 @@ class StickyPanel(CliHeaderPanel): self.valsLock.release() - return True -

1 0

[arm/master] Use consistent coloring across logs, graphs and conns.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit ead474f1498dfe6baa1fd6636ec7d14da6706bb6 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 10 20:43:56 2011 +0500 Use consistent coloring across logs, graphs and conns. --- src/gui/arm.xml | 3 +++ src/gui/connections/circEntry.py | 7 +++++-- src/gui/connections/connEntry.py | 5 +++-- src/gui/graphing/graphStats.py | 9 +++++---- src/gui/logPanel.py | 16 ++++++++++------ src/util/gtkTools.py | 21 +++++++++++++++++++++ 6 files changed, 47 insertions(+), 14 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 0aafb28..67409ae 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -435,6 +435,7 @@ <property name="model">treestore_conn</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> + <property name="rules_hint">True</property> <property name="search_column">0</property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_conn_origin"> @@ -617,6 +618,7 @@ each direction. (Default: 0) </span></property> <property name="model">liststore_sticky</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> + <property name="rules_hint">True</property> <property name="search_column">0</property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_key"> @@ -667,6 +669,7 @@ each direction. (Default: 0) </span></property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="model">liststore_log</property> + <property name="rules_hint">True</property> <child> <object class="GtkTreeViewColumn" id="treeviewcolumn_log_timestamp"> <property name="title">Time</property> diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index a7ddc13..b3aa29a 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -5,6 +5,7 @@ Connection panel entries for client circuits. import time from cli.connections import circEntry +from util import gtkTools class CircEntry(circEntry.CircEntry): @classmethod @@ -20,8 +21,9 @@ class CircHeaderLine(circEntry.CircHeaderLine): local = "%s:%s" % (self.local.ipAddr, self.local.port) foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) + theme = gtkTools.Theme() - return (local, foreign, timeLabel, self.baseType, 'blue') + return (local, foreign, timeLabel, self.baseType, theme.colors['active']) class CircLine(circEntry.CircLine): @classmethod @@ -32,6 +34,7 @@ class CircLine(circEntry.CircLine): local = "%s:%s" % (self.local.ipAddr, self.local.port) foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) + theme = gtkTools.Theme() - return (local, foreign, timeLabel, self.baseType, 'black') + return (local, foreign, timeLabel, self.baseType, theme.colors['normal']) diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index 1acef49..e7e666b 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -7,7 +7,7 @@ import time from cli.connections import connEntry, entries from cli.connections.connEntry import CONFIG, Category -from util import uiTools, torTools +from util import gtkTools, uiTools, torTools class ConnectionEntry(connEntry.ConnectionEntry): @classmethod @@ -55,6 +55,7 @@ class ConnectionLine(connEntry.ConnectionLine): dst = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) + theme = gtkTools.Theme() - return (src, dst, timeLabel, self.getType(), 'red') + return (src, dst, timeLabel, self.getType(), theme.colors['insensitive']) diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 51150f8..250503d 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -11,7 +11,7 @@ import gobject import gtk from TorCtl import TorCtl -from util import uiTools, torTools +from util import gtkTools, uiTools, torTools from cagraph.ca_graph import CaGraph from cagraph.axis.xaxis import CaGraphXAxis @@ -62,10 +62,11 @@ class GraphStats(TorCtl.PostEventListener): series = CaGraphSeriesArea(graph, 0, 1) - primaryColor = placeholder.style.fg[gtk.STATE_NORMAL] - secondaryColor = placeholder.style.fg[gtk.STATE_INSENSITIVE] + theme = gtkTools.Theme() + primaryColor = theme.colors['normal'] + secondaryColor = theme.colors['insensitive'] colors = { 'primary' : (primaryColor.red_float, primaryColor.green_float, primaryColor.blue_float, 0.5), - 'secondary' : (secondaryColor.red_float, secondaryColor.green_float, secondaryColor.blue_float, 0.7) } + 'secondary' : (secondaryColor.red_float, secondaryColor.green_float, secondaryColor.blue_float, 0.5) } series.style.point_radius = 0.0 series.style.line_color = colors[name] diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 20331ad..192eb8d 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -13,14 +13,14 @@ import gobject import gtk from TorCtl import TorCtl -from util import log, uiTools, torTools +from util import log, gtkTools, uiTools, torTools from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, LogEntry, TorEventObserver, DEFAULT_CONFIG) -RUNLEVEL_EVENT_COLOR = {log.DEBUG: "#C73043", log.INFO: "#762A2A", log.NOTICE: "#222222", - log.WARN: "#AB7814", log.ERR: "#EC131F"} +RUNLEVEL_EVENT_COLOR = {log.DEBUG: 'insensitive', log.INFO: 'normal', log.NOTICE: 'normal', + log.WARN: 'active', log.ERR: 'active'} STARTUP_EVENTS = 'N3' REFRESH_RATE = 3 @@ -52,7 +52,8 @@ class LogPanel: armEventBacklog = deque() for level, msg, eventTime in log._getEntries(setRunlevels): - armEventEntry = LogEntry(eventTime, "ARM_" + level, msg, RUNLEVEL_EVENT_COLOR[level]) + theme = gtkTools.Theme() + armEventEntry = LogEntry(eventTime, "ARM_" + level, msg, theme.colors[RUNLEVEL_EVENT_COLOR[level]]) armEventBacklog.appendleft(armEventEntry) while armEventBacklog or torEventBacklog: @@ -88,6 +89,7 @@ class LogPanel: try: for entry in self.msgLog: timeLabel = time.strftime('%H:%M:%S', time.localtime(entry.timestamp)) + row = (long(entry.timestamp), timeLabel, entry.type, entry.msg, entry.color) liststore.append(row) finally: @@ -107,11 +109,13 @@ class LogPanel: gobject.idle_add(self.fill_log) def _register_arm_event(self, level, msg, eventTime): - eventColor = RUNLEVEL_EVENT_COLOR[level] + theme = gtkTools.Theme() + eventColor = theme.colors[RUNLEVEL_EVENT_COLOR[level]] self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) def _register_torctl_event(self, level, msg): - eventColor = RUNLEVEL_EVENT_COLOR[level] + theme = gtkTools.Theme() + eventColor = theme.colors[RUNLEVEL_EVENT_COLOR[level]] self.register_event(LogEntry(time.time(), "TORCTL_%s" % level, msg, eventColor)) def _compare_rows(self, treemodel, iter1, iter2, data=None): diff --git a/src/util/gtkTools.py b/src/util/gtkTools.py new file mode 100644 index 0000000..083fb5d --- /dev/null +++ b/src/util/gtkTools.py @@ -0,0 +1,21 @@ +""" +Helper module for getting Gtk+ theme colors. +""" + +import gtk + +COLOR_MAP = { + 'normal' : ('fg', gtk.STATE_NORMAL), + 'active' : ('fg', gtk.STATE_ACTIVE), + 'insensitive' : ('fg', gtk.STATE_INSENSITIVE), +} + +class Theme: + def __init__(self): + self.colors = {} + + widget = gtk.Button() + + for (key, (prop, state)) in COLOR_MAP.items(): + self.colors[key] = getattr(widget.style, prop)[state] +

1 0

[arm/master] Release lock before returning in case all entries are cached.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 667039af25376132c131d999ab984dd72fa86094 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 18:57:49 2011 +0500 Release lock before returning in case all entries are cached. --- src/gui/connections/connPanel.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 2c2248a..3c570c3 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -77,6 +77,7 @@ class ConnectionPanel(CliConnectionPanel): index = index + 1 if index == len(self._entryLines): + self.valsLock.release() return True # one of the entries was not found in cache, clear and repopulate the treestore

1 0

[arm/master] Use distinguishing colors for entry lines.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 50940a058d0481fc8edb8300e998a8e8f05a4274 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 18:51:06 2011 +0500 Use distinguishing colors for entry lines. --- src/gui/connections/circEntry.py | 2 +- src/gui/connections/connEntry.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index cb79a9b..036fbab 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -21,7 +21,7 @@ class CircHeaderLine(circEntry.CircHeaderLine): foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) - return (local, foreign, timeLabel, self.baseType, 'black') + return (local, foreign, timeLabel, self.baseType, 'blue') class CircLine(circEntry.CircLine): @classmethod diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index bc4ec53..5888532 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -22,5 +22,5 @@ class ConnectionLine(connEntry.ConnectionLine): foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) - return (local, foreign, timeLabel, self.baseType, 'black') + return (local, foreign, timeLabel, self.baseType, 'red')

1 0

[arm/master] Populate connection lines with IP addresses.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit de206a1af1d8e37b3b59a077084a146f1d9ef1d0 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 10 19:24:41 2011 +0500 Populate connection lines with IP addresses. --- src/gui/connections/circEntry.py | 4 +- src/gui/connections/connEntry.py | 46 +++++++++++++++++++++++++++++++++----- src/gui/connections/connPanel.py | 2 +- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index 036fbab..a7ddc13 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -16,7 +16,7 @@ class CircHeaderLine(circEntry.CircHeaderLine): def convertToGui(self, instance): instance.__class__ = self - def getListingRow(self): + def getListingRow(self, listingType): local = "%s:%s" % (self.local.ipAddr, self.local.port) foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) @@ -28,7 +28,7 @@ class CircLine(circEntry.CircLine): def convertToGui(self, instance): instance.__class__ = self - def getListingRow(self): + def getListingRow(self, listingType): local = "%s:%s" % (self.local.ipAddr, self.local.port) foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) timeLabel = "%d s" % (time.time() - self.startTime) diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py index 5888532..1acef49 100644 --- a/src/gui/connections/connEntry.py +++ b/src/gui/connections/connEntry.py @@ -5,7 +5,9 @@ Connection panel entries related to actual connections to or from the system import time -from cli.connections import connEntry +from cli.connections import connEntry, entries +from cli.connections.connEntry import CONFIG, Category +from util import uiTools, torTools class ConnectionEntry(connEntry.ConnectionEntry): @classmethod @@ -17,10 +19,42 @@ class ConnectionLine(connEntry.ConnectionLine): def convertToGui(self, instance): instance.__class__ = self - def getListingRow(self): - local = "%s:%s" % (self.local.ipAddr, self.local.port) - foreign = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) - timeLabel = "%d s" % (time.time() - self.startTime) + def getListingRow(self, listingType): + conn = torTools.getConn() + myType = self.getType() + dstAddress = self.getDestinationLabel(26, includeLocale = True) + localPort = ":%s" % self.local.getPort() if self.includePort else "" - return (local, foreign, timeLabel, self.baseType, 'red') + src, dst, etc = "", "", "" + + if listingType == entries.ListingType.IP_ADDRESS: + myExternalIpAddr = conn.getInfo("address", self.local.getIpAddr()) + addrDiffer = myExternalIpAddr != self.local.getIpAddr() + + isExpansionType = not myType in (Category.SOCKS, Category.HIDDEN, Category.CONTROL) + + if isExpansionType: srcAddress = myExternalIpAddr + localPort + else: srcAddress = self.local.getIpAddr() + localPort + + if myType in (Category.SOCKS, Category.CONTROL): + src = dstAddress + dst = srcAddress + else: + src = srcAddress + dst = dstAddress + + if addrDiffer and isExpansionType and self.includeExpandedIpAddr and CONFIG["features.connection.showColumn.expandedIp"]: + internalAddress = self.local.getIpAddr() + localPort + + if myType == Category.INBOUND: (src, dst) = (src, internalAddress) + else: (src, dst) = (internalAddress, src) + + etc = self.getEtcContent(100, listingType) + else: + src = "%s:%s" % (self.local.ipAddr, self.local.port) + dst = "%s:%s" % (self.foreign.ipAddr, self.foreign.port) + + timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) + + return (src, dst, timeLabel, self.getType(), 'red') diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 3c570c3..3b980e1 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -90,7 +90,7 @@ class ConnectionPanel(CliConnectionPanel): if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): self._resolveApps() - row = line.getListingRow() + row = line.getListingRow(self._listingType) if isinstance(line, circEntry.CircHeaderLine): currentiter = treestore.append(None, row)

1 0

[arm/master] Derive entry classes from CLI and support conversion.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 27ff1d8672e09c38571dd79bce4fc911d61ee6d2 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 18:35:08 2011 +0500 Derive entry classes from CLI and support conversion. Connection panel entry classes are derived from the CLI counterparts. The CLI instances are "converted" to GUI via class introspection while traversing the entry lines in connection panel. This will facilitate overloading getListingEntry() for returning rows for GTK+ treestore instead of lines for curses rendering. Cache keys now use __class__ attribute since that refers to the GUI entry classes. --- src/gui/connections/__init__.py | 2 +- src/gui/connections/circEntry.py | 21 +++++++++++++++++++++ src/gui/connections/connEntry.py | 17 +++++++++++++++++ src/gui/connections/connPanel.py | 38 +++++++++++++++++++++++++++++--------- 4 files changed, 68 insertions(+), 10 deletions(-) diff --git a/src/gui/connections/__init__.py b/src/gui/connections/__init__.py index 3102ead..e573074 100644 --- a/src/gui/connections/__init__.py +++ b/src/gui/connections/__init__.py @@ -2,5 +2,5 @@ Connections. """ -__all__ = ["connPanel"] +__all__ = ["connPanel", "circEntry", "connEntry"] diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py new file mode 100644 index 0000000..63436cf --- /dev/null +++ b/src/gui/connections/circEntry.py @@ -0,0 +1,21 @@ +""" +Connection panel entries for client circuits. +""" + +from cli.connections import circEntry + +class CircEntry(circEntry.CircEntry): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + +class CircHeaderLine(circEntry.CircHeaderLine): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + +class CircLine(circEntry.CircLine): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + diff --git a/src/gui/connections/connEntry.py b/src/gui/connections/connEntry.py new file mode 100644 index 0000000..4db0a10 --- /dev/null +++ b/src/gui/connections/connEntry.py @@ -0,0 +1,17 @@ +""" +Connection panel entries related to actual connections to or from the system +(ie, results seen by netstat, lsof, etc). +""" + +from cli.connections import connEntry + +class ConnectionEntry(connEntry.ConnectionEntry): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + +class ConnectionLine(connEntry.ConnectionLine): + @classmethod + def convertToGui(self, instance): + instance.__class__ = self + diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 29f18b7..d8d987a 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -11,13 +11,32 @@ from collections import deque import gobject import gtk -from cli.connections import circEntry, connEntry +from cli.connections import (circEntry as cliCircEntry, connEntry as cliConnEntry) from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel +from gui.connections import circEntry, connEntry from TorCtl import TorCtl from util import connections, sysTools, uiTools, torTools REFRESH_RATE = 3 +def convertToGui(instance): + cliToGuiMap = [ (cliCircEntry.CircEntry, circEntry.CircEntry), + (cliCircEntry.CircHeaderLine, circEntry.CircHeaderLine), + (cliCircEntry.CircLine, circEntry.CircLine), + (cliConnEntry.ConnectionEntry, connEntry.ConnectionEntry), + (cliConnEntry.ConnectionLine, connEntry.ConnectionLine)] + + for (cliClass, guiClass) in cliToGuiMap: + if isinstance(instance, cliClass): + guiClass.convertToGui(instance) + break + +def calculateCacheKey(entryLine): + local = (entryLine.local.ipAddr, entryLine.local.port) + foreign = (entryLine.foreign.ipAddr, entryLine.foreign.port) + + return (entryLine.__class__, local, foreign) + class ConnectionPanel(CliConnectionPanel): def __init__(self, builder): CliConnectionPanel.__init__(self, None) @@ -46,13 +65,12 @@ class ConnectionPanel(CliConnectionPanel): # first pass checks whether we have enough entries cached to not update the treeview index = 0 for line in self._entryLines: - local = "%s:%s" % (line.local.ipAddr, line.local.port) - foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) + convertToGui(line) + cacheKey = calculateCacheKey(line) - cachekey = (local, foreign, isinstance(line, circEntry.CircHeaderLine)) - if self.cache.has_key(cachekey): + if self.cache.has_key(cacheKey): timeLabel = "%d s" % (time.time() - line.startTime) - treestore.set_value(self.cache[cachekey], 2, timeLabel) + treestore.set_value(self.cache[cacheKey], 2, timeLabel) else: break @@ -61,11 +79,13 @@ class ConnectionPanel(CliConnectionPanel): if index == len(self._entryLines): return True + # one of the entries was not found in cache, clear and repopulate the treestore treestore.clear() - headeriter = None for line in self._entryLines: + convertToGui(line) + if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): self._resolveApps() @@ -82,8 +102,8 @@ class ConnectionPanel(CliConnectionPanel): else: currentiter = treestore.append(None, row) - cachekey = (local, foreign, isinstance(line, circEntry.CircHeaderLine)) - self.cache[cachekey] = currentiter + cacheKey = calculateCacheKey(line) + self.cache[cacheKey] = currentiter self.valsLock.release()

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits July 2011