- tor-commits - lists.torproject.org

[arm/master] fix: correcting some port types and descriptions
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 17fa269873a561b7ba8f843c3030373014277b3a Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Jul 1 15:57:20 2011 -0700 fix: correcting some port types and descriptions Secure mail ports were misclassified, and descriptions for the mail and web policies were missing ports. --- src/settings.cfg | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/settings.cfg b/src/settings.cfg index 076299d..7f2953f 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -435,8 +435,8 @@ wizard.description.opt Portforward => If needed, attempts NAT traversal using UP wizard.description.opt Startup => Runs Tor in the background when the system starts. wizard.description.opt Notice => Provides a disclaimer that this is an exit on port 80 (http://www.atagar.com/exitNotice) wizard.description.opt Policy => Ports allowed to exit from your relay. The default policy allows for common services while limiting the chance of getting a DMCA takedown for torrent traffic (http://www.atagar.com/exitPolicy) -wizard.description.opt Websites => General Internet browsing including HTTP (80) and HTTPS (443). -wizard.description.opt Email => Protocols for receiving, but not sending email. This includes POP3 (110), POP3S (995), IMAP (143), and IMAPS (993). +wizard.description.opt Websites => General Internet browsing including HTTP (80), HTTPS (443), common alternatives (81, 8008), and proxies (3128, 8080) +wizard.description.opt Email => Protocols for receiving, but not sending email. This includes POP3 (110), POP3S (995), IMAP (143, 220), and IMAPS (993). wizard.description.opt Im => Common instant messaging protocols including Jabber, IRC, ICQ, AIM, Yahoo, MSN, SILC, GroupWise, Gadu-Gadu, Sametime, and Zephyr. wizard.description.opt Misc => Protocols from the default policy that aren't among the above. wizard.description.opt Plaintext => When blocked the policy will exclude ports that aren't commonly encrypted. @@ -836,9 +836,9 @@ port.exit.misc 981 # SofaWare Firewall Administration port.exit.misc 989-990 # FTPS port.exit.misc 991 # NAS port.exit.misc 992 # Telnet -port.exit.misc 993 # IMAPS +port.exit.mail 993 # IMAPS port.exit.im 994 # IRC over SSL -port.exit.misc 995 # POP3S +port.exit.mail 995 # POP3S port.exit.misc 1194 # OpenVPN port.exit.misc 1220 # QuickTime port.exit.misc 1293 # PKT-KRB-IPSec @@ -895,6 +895,8 @@ port.encrypted 749 port.encrypted 981 port.encrypted 989 port.encrypted 990 +port.encrypted 993 +port.encrypted 995 port.encrypted 1194 port.encrypted 1293 port.encrypted 1723

1 0

[arm/master] Input field validation for circ reuse durations
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 5e0178152ddf08b4c1a8011dc74667c65c9a750a Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 18:08:36 2011 -0700 Input field validation for circ reuse durations --- src/cli/wizard.py | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 16752e7..80d2fd1 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -215,6 +215,7 @@ def showWizard(): config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) + config[Options.REUSE].setValidator(_circDurationValidator) # enables custom policies when 'custom' is selected and disables otherwise policyOpt = config[Options.POLICY] @@ -432,7 +433,7 @@ def _toggleEnabledAction(toggleOptions, option, value): def _relayRateValidator(option, value): if value.count(" ") != 1: - msg = "This should be a measurement followed by the rate (for instance, \"5 MB/s\")" + msg = "This should be a rate measurement (for instance, \"5 MB/s\")" raise ValueError(msg) rate, units = value.split(" ", 1) @@ -447,7 +448,7 @@ def _relayRateValidator(option, value): def _monthlyLimitValidator(option, value): if value.count(" ") != 1: - msg = "This should be a measurement followed by the units (for instance, \"5 MB\")" + msg = "This should be a traffic size (for instance, \"5 MB\")" raise ValueError(msg) rate, units = value.split(" ", 1) @@ -457,6 +458,8 @@ def _monthlyLimitValidator(option, value): elif not units in acceptedUnits: msg = "'%s' is an invalid unit, options include \"%s\"" % (units, "\", \"".join(acceptedUnits)) raise ValueError(msg) + elif (int(rate) < 50 and units == "MB") or int(rate) < 1: + raise ValueError("To be usable as a relay's monthly limit should be at least 50 MB") def _bridgeDestinationValidator(option, value): if value.count(":") != 1: @@ -468,3 +471,18 @@ def _bridgeDestinationValidator(option, value): elif not port.isdigit() or int(port) < 0 or int(port) > 65535: raise ValueError("'%s' isn't a valid port number" % port) +def _circDurationValidator(option, value): + if value.count(" ") != 1: + msg = "This should be a time measurement (for instance, \"10 minutes\")" + raise ValueError(msg) + + rate, units = value.split(" ", 1) + acceptedUnits = ("minute", "minutes", "hour", "hours") + if not rate.isdigit(): + raise ValueError("'%s' isn't an integer" % rate) + elif not units in acceptedUnits: + msg = "'%s' is an invalid rate, options include \"minutes\" or \"hours\"" + raise ValueError(msg) + elif (int(rate) < 5 and units in ("minute", "minutes")) or int(rate) < 1: + raise ValueError("This would cause high network load, don't set this to less than five minutes") +

1 0

[arm/master] Input field validation for bandwith rates
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 90fba07ce66de9e811aa762b835b769a254c438b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 10:39:51 2011 -0700 Input field validation for bandwith rates --- src/cli/wizard.py | 18 +++++++++++++++++- 1 files changed, 17 insertions(+), 1 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 219c6b6..43d107b 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -210,6 +210,7 @@ def showWizard(): else: config[option] = ConfigOption(option, "opt", default) # sets input validators + config[Options.BANDWIDTH].setValidator(_relayRateValidator) config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) @@ -391,7 +392,7 @@ def promptConfigOptions(relayType, config): if newValue: try: options[selection].setValue(newValue.strip()) except ValueError, exc: - cli.popups.showMsg(str(exc), 2) + cli.popups.showMsg(str(exc), 3) cli.controller.getController().requestRedraw(True) elif key == 27: selection, key = -1, curses.KEY_ENTER # esc - cancel finally: @@ -428,6 +429,21 @@ def _toggleEnabledAction(toggleOptions, option, value): for opt in toggleOptions: opt.setEnabled(value) +def _relayRateValidator(option, value): + if value.count(" ") != 1: + msg = "This should be a measurement followed by the rate (for instance, \"5 MB/s\")" + raise ValueError(msg) + + rate, units = value.split(" ", 1) + acceptedUnits = ("KB/s", "MB/s", "GB/s") + if not rate.isdigit(): + raise ValueError("'%s' isn't an integer" % rate) + elif not units in acceptedUnits: + msg = "'%s' is an invalid rate, options include \"%s\"" % (units, "\", \"".join(acceptedUnits)) + raise ValueError(msg) + elif (int(rate) < 20 and units == "KB/s") or int(rate) < 1: + raise ValueError("To be usable as a relay the rate must be at least 20 KB/s") + def _bridgeDestinationValidator(option, value): if value.count(":") != 1: raise ValueError("Bridges are of the form '<ip address>:<port>'")

1 0

[arm/master] fix: workaround for textpad insert mode issues
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit dd81736d16d638343b3954f2def575378b5ea309 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 16:54:53 2011 -0700 fix: workaround for textpad insert mode issues The insert mode of the textpad class has a couple issues: - it's only available in Python 2.6+ - if the text doens't have the default formatting then it doens't work (input is replacement mode instead) This drops usage for the insert mode flag, instead doing it ourselves via arm's textpad validator. This is kinda vital for the wizard since that text has attibutes and not having insert mode there was pretty painful. --- src/util/panel.py | 29 +++++++++++++++++++---------- src/util/uiTools.py | 8 +++++--- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/src/util/panel.py b/src/util/panel.py index 59d2b13..1be2306 100644 --- a/src/util/panel.py +++ b/src/util/panel.py @@ -2,11 +2,11 @@ Wrapper for safely working with curses subwindows. """ -import sys import copy import time import traceback import curses +import curses.ascii import curses.textpad from threading import RLock @@ -613,15 +613,9 @@ class Panel(): # Displays the text field, blocking until the user's done. This closes the # text panel and returns userInput to the initial text if the user presses - # escape. Insert mode is available in Python 2.6+, before that the - # constructor only accepted a subwindow argument as per: - # https://trac.torproject.org/projects/tor/ticket/2354 + # escape. - majorVersion, minorVersion = sys.version_info[:2] - if majorVersion == 2 and minorVersion >= 6: - textbox = curses.textpad.Textbox(inputSubwindow, True) - else: - textbox = curses.textpad.Textbox(inputSubwindow) + textbox = curses.textpad.Textbox(inputSubwindow) textbox.win.attron(format) userInput = textbox.edit(lambda key: _textboxValidate(textbox, key)).strip() @@ -738,7 +732,22 @@ def _textboxValidate(textbox, key): """ y, x = textbox.win.getyx() - if key == 27: + + if curses.ascii.isprint(key) and x < textbox.maxx: + # Shifts the existing text forward so input is an insert method rather + # than replacement. The curses.textpad accepts an insert mode flag but + # this has a couple issues... + # - The flag is only available for Python 2.6+, before that the + # constructor only accepted a subwindow argument as per: + # https://trac.torproject.org/projects/tor/ticket/2354 + # - The textpad doesn't shift text that has text attributes. This is + # because keycodes read by textbox.win.inch() includes formatting, + # causing the curses.ascii.isprint() check it does to fail. + + currentInput = textbox.gather() + textbox.win.addstr(y, x + 1, currentInput[x:textbox.maxx - 1]) + textbox.win.move(y, x) # reverts cursor movement during gather call + elif key == 27: # curses.ascii.BEL is a character codes that causes textpad to terminate return curses.ascii.BEL elif key == curses.KEY_HOME: diff --git a/src/util/uiTools.py b/src/util/uiTools.py index 52885de..68b93af 100644 --- a/src/util/uiTools.py +++ b/src/util/uiTools.py @@ -282,15 +282,17 @@ def cropStr(msg, size, minWordLen = 4, minCrop = 0, endType = Ending.ELLIPSE, ge if getRemainder: return (returnMsg, remainder) else: return returnMsg -def padStr(msg, size): +def padStr(msg, size, cropExtra = False): """ Provides the string padded with whitespace to the given length. Arguments: - msg - string to be padded - size - length to be padded to + msg - string to be padded + size - length to be padded to + cropExtra - crops string if it's longer than the size if true """ + if cropExtra: msg = msg[:size] return ("%%-%is" % size) % msg def camelCase(label, divider = "_", joiner = " "):

1 0

[arm/master] Input field validation for monthly limit
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 5625ac4baf6f333e024ce4537031ef434416a0ec Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 17:51:49 2011 -0700 Input field validation for monthly limit --- src/cli/wizard.py | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/src/cli/wizard.py b/src/cli/wizard.py index 43d107b..16752e7 100644 --- a/src/cli/wizard.py +++ b/src/cli/wizard.py @@ -211,6 +211,7 @@ def showWizard(): # sets input validators config[Options.BANDWIDTH].setValidator(_relayRateValidator) + config[Options.LIMIT].setValidator(_monthlyLimitValidator) config[Options.BRIDGE1].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE2].setValidator(_bridgeDestinationValidator) config[Options.BRIDGE3].setValidator(_bridgeDestinationValidator) @@ -444,6 +445,19 @@ def _relayRateValidator(option, value): elif (int(rate) < 20 and units == "KB/s") or int(rate) < 1: raise ValueError("To be usable as a relay the rate must be at least 20 KB/s") +def _monthlyLimitValidator(option, value): + if value.count(" ") != 1: + msg = "This should be a measurement followed by the units (for instance, \"5 MB\")" + raise ValueError(msg) + + rate, units = value.split(" ", 1) + acceptedUnits = ("MB", "GB", "TB") + if not rate.isdigit(): + raise ValueError("'%s' isn't an integer" % rate) + elif not units in acceptedUnits: + msg = "'%s' is an invalid unit, options include \"%s\"" % (units, "\", \"".join(acceptedUnits)) + raise ValueError(msg) + def _bridgeDestinationValidator(option, value): if value.count(":") != 1: raise ValueError("Bridges are of the form '<ip address>:<port>'")

1 0

[arm/master] fix: last tor runtime showed if never connected
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit c2b4bd61b78b2b5fcda639c0f791f998223955ff Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 3 18:13:22 2011 -0700 fix: last tor runtime showed if never connected The header panel shows when arm was last detached from Tor. However, if we have never connected to a Tor control port then this is nonesense, showing the epoch time ("16:00 12/31/1969") instead. Dropping the field in this case. --- src/cli/headerPanel.py | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/cli/headerPanel.py b/src/cli/headerPanel.py index 846c1db..5a2c1bc 100644 --- a/src/cli/headerPanel.py +++ b/src/cli/headerPanel.py @@ -204,10 +204,14 @@ class HeaderPanel(panel.Panel, threading.Thread): x += 17 else: statusTime = torTools.getConn().getStatus()[1] - statusTimeLabel = time.strftime("%H:%M %m/%d/%Y", time.localtime(statusTime)) + + if statusTime: + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) + else: statusTimeLabel = "" # never connected to tor + self.addstr(1, x, "Tor Disconnected", curses.A_BOLD | uiTools.getColor("red")) - self.addstr(1, x + 16, " (%s, press r to reconnect)" % statusTimeLabel) - x += 41 + len(statusTimeLabel) + self.addstr(1, x + 16, " (%spress r to reconnect)" % statusTimeLabel) + x += 39 + len(statusTimeLabel) includeControlPort = False if includeControlPort:

1 0

[arm/master] Implement bandwidth stats in graph labels.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit 40174345257913b871b87e8e513b911b0ec07205 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 18 19:36:03 2011 +0500 Implement bandwidth stats in graph labels. --- src/gui/arm.xml | 10 ++++---- src/gui/controller.py | 4 ++- src/gui/graphing/bandwidthStats.py | 37 ++++++++++++++++++++++++---- src/gui/graphing/graphStats.py | 47 +++++++++++++++++++++++++++++------ 4 files changed, 79 insertions(+), 19 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 23230b6..e62c622 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -303,7 +303,7 @@ <child> <object class="GtkLabel" id="label_graph_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Limit: 40 Mb/s, Burst: 80 Mb/s</property> + <property name="label" translatable="yes">Limit: 0 B/s, Burst: 0 B/s</property> </object> <packing> <property name="expand">False</property> @@ -321,7 +321,7 @@ <child> <object class="GtkLabel" id="label_graph_primary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Download (0.0 b/sec)</property> + <property name="label" translatable="yes">Download: 0.00 Kb/s</property> </object> <packing> <property name="expand">False</property> @@ -344,7 +344,7 @@ <child> <object class="GtkLabel" id="label_graph_primary_bottom"> <property name="visible">True</property> - <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> + <property name="label" translatable="yes">avg: 0.00 b/s, total: 0.00 B</property> </object> <packing> <property name="expand">False</property> @@ -364,7 +364,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Upload (0.0 b/sec)</property> + <property name="label" translatable="yes">Upload: 0.00 Kb/s</property> </object> <packing> <property name="expand">False</property> @@ -387,7 +387,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_bottom"> <property name="visible">True</property> - <property name="label" translatable="yes">avg: 3.5 Kb/sec, total: 2.0 MB</property> + <property name="label" translatable="yes">avg: 0.00 KB/s, total: 0.00 MB</property> </object> <packing> <property name="expand">False</property> diff --git a/src/gui/controller.py b/src/gui/controller.py index 91b9a03..7f85b9a 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -26,10 +26,12 @@ class GuiController: self._pack_graph_widget('primary') self._pack_graph_widget('secondary') - self.bwStats = bandwidthStats.BandwidthStats(self.widgets) + self.bwStats = bandwidthStats.BandwidthStats(self.builder, self.widgets) gobject.timeout_add(1000, self.bwStats.draw_graph, 'primary') gobject.timeout_add(1000, self.bwStats.draw_graph, 'secondary') + gobject.timeout_add(1000, self.bwStats.update_labels, 'primary') + gobject.timeout_add(1000, self.bwStats.update_labels, 'secondary') def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index 304574e..a8278d8 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -9,18 +9,45 @@ import gtk from TorCtl import TorCtl from gui.graphing import graphStats -from util import torTools +from util import uiTools, torTools class BandwidthStats(graphStats.GraphStats): - def __init__(self, widgets): - graphStats.GraphStats.__init__(self, widgets) + def __init__(self, builder, widgets): + graphStats.GraphStats.__init__(self, builder, widgets) conn = torTools.getConn() if not conn.isAlive(): conn.init() - conn.setControllerEvents(["BW"]) + + conn.setControllerEvents(["BW", "NEWDESC"]) conn.addEventListener(self) + self.new_desc_event(None) + + def new_desc_event(self, event): + conn = torTools.getConn() + + if not conn.isAlive(): + return + + bwRate = conn.getMyBandwidthRate() + bwBurst = conn.getMyBandwidthBurst() + bwObserved = conn.getMyBandwidthObserved() + bwMeasured = conn.getMyBandwidthMeasured() + + if bwRate and bwBurst: + bwRateLabel = uiTools.getSizeLabel(bwRate, 1, False, isBytes=False) + bwBurstLabel = uiTools.getSizeLabel(bwBurst, 1, False, isBytes=False) + + msg = "Limit: %s/s, Burst: %s/s" % (bwRateLabel, bwBurstLabel) + label = self.builder.get_object('label_graph_top') + label.set_text(msg) + def bandwidth_event(self, event): - self._processEvent(event.read / 1024.0, event.written / 1024.0) + self._processEvent(event.read, event.written) + + msg = 'Download: %s/s' % uiTools.getSizeLabel(event.read, 2, isBytes=False) + self.update_header('primary', msg) + msg = 'Upload: %s/s' % uiTools.getSizeLabel(event.written, 2, isBytes=False) + self.update_header('secondary', msg) diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 5037c39..c000ff4 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -11,19 +11,23 @@ import gobject import gtk from TorCtl import TorCtl -from util import torTools +from util import uiTools, torTools GRAPH_INTERVAL = 30 class GraphStats(TorCtl.PostEventListener): - def __init__(self, widgets): + def __init__(self, builder, widgets): TorCtl.PostEventListener.__init__(self) + self.builder = builder self.widgets = widgets self.data = { - 'primary' : deque([0] * GRAPH_INTERVAL), - 'secondary' : deque([0] * GRAPH_INTERVAL)} + 'primary' : deque([0.0] * GRAPH_INTERVAL), + 'secondary' : deque([0.0] * GRAPH_INTERVAL)} + + self.total = {'primary': 0.0, 'secondary' : 0.0} + self.ticks = {'primary': 0, 'secondary' : 0} def get_graph_data(self, name): packed_data = [] @@ -51,11 +55,38 @@ class GraphStats(TorCtl.PostEventListener): graph.auto_set_yrange(index) graph.queue_draw() + return True + def update_labels(self, name): + avg = 0 + + try: + avg = self.total[name] / float(self.ticks[name]) + except ZeroDivisionError: + pass + + msg = "avg: %s/s, total: %s" % (uiTools.getSizeLabel(avg, 2, isBytes=False), + uiTools.getSizeLabel(self.total[name], 2)) + label = self.builder.get_object('label_graph_%s_bottom' % name) + label.set_text(msg) + + return True + + def update_header(self, name, msg): + label = self.builder.get_object('label_graph_%s_top' % name) + label.set_text(msg) + def _processEvent(self, primary, secondary): - self.data['primary'].rotate(1) - self.data['primary'][0] = primary - self.data['secondary'].rotate(1) - self.data['secondary'][0] = secondary + values = {'primary' : primary, 'secondary' : secondary} + + for name in ('primary', 'secondary'): + # right shift and store kbytes in left-most location + self.data[name].rotate(1) + self.data[name][0] = values[name] / 1024 + + self.total[name] = self.total[name] + values[name] + + if values[name] > 0: + self.ticks[name] = self.ticks[name] + 1

1 0

[arm/master] Fixed default labels.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit bebfedd1300392223436d49e018910f56b219b37 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jun 18 19:41:39 2011 +0500 Fixed default labels. --- src/gui/arm.xml | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index e62c622..11f5c63 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -303,7 +303,7 @@ <child> <object class="GtkLabel" id="label_graph_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Limit: 0 B/s, Burst: 0 B/s</property> + <property name="label" translatable="yes">Limit: 0.00 b/s, Burst: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -321,7 +321,7 @@ <child> <object class="GtkLabel" id="label_graph_primary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Download: 0.00 Kb/s</property> + <property name="label" translatable="yes">Download: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -364,7 +364,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_top"> <property name="visible">True</property> - <property name="label" translatable="yes">Upload: 0.00 Kb/s</property> + <property name="label" translatable="yes">Upload: 0.00 b/s</property> </object> <packing> <property name="expand">False</property> @@ -387,7 +387,7 @@ <child> <object class="GtkLabel" id="label_graph_secondary_bottom"> <property name="visible">True</property> - <property name="label" translatable="yes">avg: 0.00 KB/s, total: 0.00 MB</property> + <property name="label" translatable="yes">avg: 0.00 b/s, total: 0.00 B</property> </object> <packing> <property name="expand">False</property>

1 0

[arm/master] Moved cagraph packing from controller to graphing.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit afeb960aa3d3e7f2d80e648fd837c53298ce55ae Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jun 19 12:44:37 2011 +0500 Moved cagraph packing from controller to graphing. --- src/gui/controller.py | 49 ++-------------------------------- src/gui/graphing/bandwidthStats.py | 4 +- src/gui/graphing/graphStats.py | 51 +++++++++++++++++++++++++++++++++-- 3 files changed, 53 insertions(+), 51 deletions(-) diff --git a/src/gui/controller.py b/src/gui/controller.py index 7f85b9a..4da82c9 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -2,13 +2,7 @@ import gobject import gtk from util import torTools -from gui.graphing import graphStats, bandwidthStats - -from cagraph.ca_graph import CaGraph -from cagraph.axis.xaxis import CaGraphXAxis -from cagraph.axis.yaxis import CaGraphYAxis -from cagraph.ca_graph_grid import CaGraphGrid -from cagraph.series.area import CaGraphSeriesArea +from gui.graphing import bandwidthStats gobject.threads_init() @@ -20,18 +14,8 @@ class GuiController: self.builder.add_from_file(filename) self.builder.connect_signals(self) - # for custom widgets not present in builder xml - self.widgets = {} - - self._pack_graph_widget('primary') - self._pack_graph_widget('secondary') - - self.bwStats = bandwidthStats.BandwidthStats(self.builder, self.widgets) - - gobject.timeout_add(1000, self.bwStats.draw_graph, 'primary') - gobject.timeout_add(1000, self.bwStats.draw_graph, 'secondary') - gobject.timeout_add(1000, self.bwStats.update_labels, 'primary') - gobject.timeout_add(1000, self.bwStats.update_labels, 'secondary') + self.bwStats = bandwidthStats.BandwidthStats(self.builder) + self.bwStats.pack_widgets() def run(self): window = self.builder.get_object('window_main') @@ -47,33 +31,6 @@ class GuiController: def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() - def _pack_graph_widget(self, name): - graph = CaGraph() - placeholder = self.builder.get_object('placeholder_graph_%s' % name) - placeholder.pack_start(graph) - - xaxis = CaGraphXAxis(graph) - yaxis = CaGraphYAxis(graph) - - xaxis.min = 0 - xaxis.max = graphStats.GRAPH_INTERVAL - 1 - xaxis.axis_style.draw_labels = False - - graph.axiss.append(xaxis) - graph.axiss.append(yaxis) - - series = CaGraphSeriesArea(graph, 0, 1) - - line_colors = {'primary' : (1.0, 0.0, 1.0, 1.0), 'secondary' : (0.0, 1.0, 0.0, 1.0)} - fill_colors = {'primary' : (1.0, 0.0, 1.0, 0.3), 'secondary' : (0.0, 1.0, 0.0, 0.3)} - series.style.line_color = line_colors[name] - series.style.fill_color = fill_colors[name] - - graph.seriess.append(series) - graph.grid = CaGraphGrid(graph, 0, 1) - - self.widgets['graph_%s' % name] = graph - def startGui(): controller = GuiController() controller.run() diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index a8278d8..401302c 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -12,8 +12,8 @@ from gui.graphing import graphStats from util import uiTools, torTools class BandwidthStats(graphStats.GraphStats): - def __init__(self, builder, widgets): - graphStats.GraphStats.__init__(self, builder, widgets) + def __init__(self, builder): + graphStats.GraphStats.__init__(self, builder) conn = torTools.getConn() if not conn.isAlive(): diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index c000ff4..fcd326f 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -13,15 +13,21 @@ import gtk from TorCtl import TorCtl from util import uiTools, torTools +from cagraph.ca_graph import CaGraph +from cagraph.axis.xaxis import CaGraphXAxis +from cagraph.axis.yaxis import CaGraphYAxis +from cagraph.ca_graph_grid import CaGraphGrid +from cagraph.series.area import CaGraphSeriesArea + GRAPH_INTERVAL = 30 class GraphStats(TorCtl.PostEventListener): - def __init__(self, builder, widgets): + def __init__(self, builder): TorCtl.PostEventListener.__init__(self) self.builder = builder - self.widgets = widgets + self.graphs = { 'primary' : None, 'secondary' : None } self.data = { 'primary' : deque([0.0] * GRAPH_INTERVAL), 'secondary' : deque([0.0] * GRAPH_INTERVAL)} @@ -29,6 +35,45 @@ class GraphStats(TorCtl.PostEventListener): self.total = {'primary': 0.0, 'secondary' : 0.0} self.ticks = {'primary': 0, 'secondary' : 0} + def pack_widgets(self): + self._pack_graph_widget('primary') + self._pack_graph_widget('secondary') + + gobject.timeout_add(1000, self.draw_graph, 'primary') + gobject.timeout_add(1000, self.draw_graph, 'secondary') + gobject.timeout_add(1000, self.update_labels, 'primary') + gobject.timeout_add(1000, self.update_labels, 'secondary') + + def _pack_graph_widget(self, name): + graph = CaGraph() + placeholder = self.builder.get_object('placeholder_graph_%s' % name) + placeholder.pack_start(graph) + + xaxis = CaGraphXAxis(graph) + yaxis = CaGraphYAxis(graph) + + xaxis.min = 0 + xaxis.max = GRAPH_INTERVAL - 1 + xaxis.axis_style.draw_labels = False + yaxis.axis_style.label_color = (0, 0, 0) + + graph.axiss.append(xaxis) + graph.axiss.append(yaxis) + + series = CaGraphSeriesArea(graph, 0, 1) + + line_colors = {'primary' : (1.0, 0.0, 1.0, 1.0), 'secondary' : (0.0, 1.0, 0.0, 1.0)} + fill_colors = {'primary' : (1.0, 0.0, 1.0, 0.3), 'secondary' : (0.0, 1.0, 0.0, 0.3)} + series.style.line_color = line_colors[name] + series.style.fill_color = fill_colors[name] + + graph.seriess.append(series) + graph.grid = CaGraphGrid(graph, 0, 1) + + self.graphs[name] = graph + + return graph + def get_graph_data(self, name): packed_data = [] @@ -42,7 +87,7 @@ class GraphStats(TorCtl.PostEventListener): return len(data) == map(int, data).count(0) def draw_graph(self, name): - graph = self.widgets['graph_%s' % name] + graph = self.graphs[name] data = self.get_graph_data(name) if self.is_graph_data_zero(name):

1 0

[arm/master] Support logging of arm events.
by atagar＠torproject.org 04 Jul '11

04 Jul '11

commit d5556ad4ce0c43d0aca1b287ad59c3a90bd923c5 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jun 20 16:55:05 2011 +0500 Support logging of arm events. --- src/gui/__init__.py | 2 +- src/gui/arm.xml | 8 +------ src/gui/controller.py | 14 +++++++----- src/gui/logPanel.py | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 66 insertions(+), 14 deletions(-) diff --git a/src/gui/__init__.py b/src/gui/__init__.py index f461b3e..b700273 100644 --- a/src/gui/__init__.py +++ b/src/gui/__init__.py @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["controller"] +__all__ = ["controller", "logPanel"] diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 11f5c63..8cbb924 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -692,11 +692,5 @@ each direction. (Default: 0) </span></property> </object> </child> </object> - <object class="GtkTextBuffer" id="textbuffer_log"> - <property name="text" translatable="yes">16:09:20 [NOTICE] Bootstrapped 90%: Establishing a Tor circuit. -16:09:23 [NOTICE] Tor has successfully opened a circuit. Looks like client functionality is working. -16:09:23 [NOTICE] Tor has successfully opened a circuit. Looks like client functionality is working. -16:09:24 [NOTICE] Bootstrapped 100%: Done. -</property> - </object> + <object class="GtkTextBuffer" id="textbuffer_log"/> </interface> diff --git a/src/gui/controller.py b/src/gui/controller.py index 4da82c9..8f27df4 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -1,7 +1,8 @@ import gobject import gtk -from util import torTools +from util import log, torTools +from gui import logPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -17,14 +18,15 @@ class GuiController: self.bwStats = bandwidthStats.BandwidthStats(self.builder) self.bwStats.pack_widgets() + self.logPanel = logPanel.LogPanel(self.builder) + self.logPanel.pack_widgets() + + log.log(log.DEBUG, "Hello World!") + log.log(log.ERR, "Hello Again!") + def run(self): window = self.builder.get_object('window_main') - textbuffer = self.builder.get_object('textbuffer_log') - conn = torTools.getConn() - torPid = conn.getMyPid() - textbuffer.set_text("Tor pid: %s" % torPid) - window.show_all() gtk.main() diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py new file mode 100644 index 0000000..174ed64 --- /dev/null +++ b/src/gui/logPanel.py @@ -0,0 +1,56 @@ +""" +Base class for implementing graphing functionality. +""" + +import random +import sys + +from collections import deque + +import gobject +import gtk + +from TorCtl import TorCtl +from util import log, uiTools, torTools + +from cli.logPanel import RUNLEVEL_EVENT_COLOR, LogEntry + +class LogPanel: + def __init__(self, builder): + self.builder = builder + + self.msgLog = deque() + + log.LOG_LOCK.acquire() + try: + armRunlevels = [log.DEBUG, log.INFO, log.NOTICE, log.WARN, log.ERR] + log.addListeners(armRunlevels, self._register_arm_event) + finally: + log.LOG_LOCK.release() + + textbuffer = self.builder.get_object('textbuffer_log') + + for color in RUNLEVEL_EVENT_COLOR.values(): + textbuffer.create_tag(color, foreground=color) + + gobject.timeout_add(1000, self.print_log) + + def print_log(self): + textbuffer = self.builder.get_object('textbuffer_log') + start, end = textbuffer.get_bounds() + textbuffer.delete(start, end) + + for entry in self.msgLog: + iter = textbuffer.get_iter_at_mark(textbuffer.get_insert()) + textbuffer.insert_with_tags_by_name(iter, entry.getDisplayMessage() + "\n", entry.color) + + def register_event(self, event): + self.msgLog.appendleft(event) + + def pack_widgets(self): + pass + + def _register_arm_event(self, level, msg, eventTime): + eventColor = RUNLEVEL_EVENT_COLOR[level] + self.register_event(LogEntry(eventTime, "ARM_%s" % level, msg, eventColor)) +

1 0