- tor-commits - lists.torproject.org

[arm/master] Catch conn.init() exception in case starter wants detached startup.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 7a863f9fdda39f0f9a0d2cd572a283ba38fa37bf Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 16 00:49:42 2011 +0500 Catch conn.init() exception in case starter wants detached startup. --- src/gui/graphing/bandwidthStats.py | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/src/gui/graphing/bandwidthStats.py b/src/gui/graphing/bandwidthStats.py index 401302c..04dfda8 100644 --- a/src/gui/graphing/bandwidthStats.py +++ b/src/gui/graphing/bandwidthStats.py @@ -8,6 +8,7 @@ import gobject import gtk from TorCtl import TorCtl +from starter import CONFIG from gui.graphing import graphStats from util import uiTools, torTools @@ -17,7 +18,13 @@ class BandwidthStats(graphStats.GraphStats): conn = torTools.getConn() if not conn.isAlive(): - conn.init() + try: + conn.init() + except ValueError: + if CONFIG['features.allowDetachedStartup']: + return + else: + raise conn.setControllerEvents(["BW", "NEWDESC"]) conn.addEventListener(self)

1 0

[arm/master] The mass gtk cleanup.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 52c50c8dbe94b5f8504fc0572b68749b9cd8bbc9 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 15:12:30 2011 +0500 The mass gtk cleanup. Add toolbar, move "sticky" panel to the notebook (the application looks much more consistent this way), add about dialog and fix various width/height issues. --- src/gui/arm.xml | 327 ++++++++++++++------------------------- src/gui/controller.py | 17 ++- src/gui/generalPanel.py | 123 +++++++++++++++ src/gui/graphing/graphStats.py | 2 + src/gui/stickyPanel.py | 123 --------------- 5 files changed, 257 insertions(+), 335 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index f71d0b7..edcc42a 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -2,7 +2,7 @@ <interface> <requires lib="gtk+" version="2.16"/>  - <object class="GtkListStore" id="liststore_sticky"> + <object class="GtkListStore" id="liststore_general"> <columns>  <column type="gchararray"/> @@ -100,46 +100,10 @@ <object class="GtkMenu" id="menu_file"> <property name="visible">True</property> <child> - <object class="GtkImageMenuItem" id="imagemenuitem_new"> - <property name="label">gtk-new</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_open"> - <property name="label">gtk-open</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_save"> - <property name="label">gtk-save</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_saveas"> - <property name="label">gtk-save-as</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem_file"> - <property name="visible">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_exit"> + <object class="GtkImageMenuItem" id="imagemenuitem_quit"> <property name="label">gtk-quit</property> <property name="visible">True</property> + <property name="related_action">action_quit</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -149,57 +113,6 @@ </object> </child> <child> - <object class="GtkMenuItem" id="menuitem_edit"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Edit</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="menu_edit"> - <property name="visible">True</property> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_cut"> - <property name="label">gtk-cut</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_copy"> - <property name="label">gtk-copy</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_paste"> - <property name="label">gtk-paste</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="imagemenuitem_delete"> - <property name="label">gtk-delete</property> - <property name="visible">True</property> - <property name="use_underline">True</property> - <property name="use_stock">True</property> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkMenuItem" id="menuitem_view"> - <property name="visible">True</property> - <property name="label" translatable="yes">_View</property> - <property name="use_underline">True</property> - </object> - </child> - <child> <object class="GtkMenuItem" id="menuitem_help"> <property name="visible">True</property> <property name="label" translatable="yes">_Help</property> @@ -211,6 +124,7 @@ <object class="GtkImageMenuItem" id="imagemenuitem_about"> <property name="label">gtk-about</property> <property name="visible">True</property> + <property name="related_action">action_about</property> <property name="use_underline">True</property> <property name="use_stock">True</property> </object> @@ -231,13 +145,48 @@ <property name="can_focus">True</property> <property name="orientation">vertical</property> <child> - <object class="GtkHPaned" id="hpaned_main"> - <property name="height_request">300</property> + <object class="GtkVBox" id="vbox_notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkToolbar" id="toolbar_main"> + <property name="visible">True</property> + <child> + <object class="GtkToolButton" id="toolbutton_about"> + <property name="visible">True</property> + <property name="related_action">action_about</property> + <property name="use_action_appearance">True</property> + <property name="label" translatable="yes">About</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-about</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + <child> + <object class="GtkToolButton" id="toolbutton_quit"> + <property name="visible">True</property> + <property name="related_action">action_quit</property> + <property name="use_action_appearance">True</property> + <property name="label" translatable="yes">Quit</property> + <property name="use_underline">True</property> + <property name="stock_id">gtk-quit</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">True</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> <child> <object class="GtkNotebook" id="notebook_main"> - <property name="width_request">300</property> <property name="visible">True</property> <property name="can_focus">True</property> <child> @@ -461,81 +410,44 @@ </packing> </child> <child> - <object class="GtkVBox" id="vbox_config"> + <object class="GtkScrolledWindow" id="scrolledwindow_general"> <property name="visible">True</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkLabel" id="label_config_top"> - <property name="visible">True</property> - <property name="label" translatable="yes">RelayBandwidthBurst (General Option) -Value: 0 B (default, DataSize, usage: N bytes|KB|MB|GB|TB) -Description: Limit the maximum token bucket size (also known as -the burst) for relayed traffic to the given number of bytes in -each direction. (Default: 0) </property> - <property name="use_markup">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow_config"> + <object class="GtkTreeView" id="treeview_general"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> + <property name="model">liststore_general</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="GtkTreeView" id="treeview_config"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">liststore_config</property> - <property name="headers_visible">False</property> - <property name="headers_clickable">False</property> - <property name="search_column">0</property> + <object class="GtkTreeViewColumn" id="treeviewcolumn_general_key"> + <property name="title">column</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_key"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_key"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">0</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext_general_key"/> + <attributes> + <attribute name="markup">0</attribute> + </attributes> </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="treeviewcolumn_general_value"> + <property name="title">column</property> <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_value"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_value"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">1</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_desc"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_config_desc"/> - <attributes> - <attribute name="foreground">3</attribute> - <attribute name="markup">2</attribute> - </attributes> - </child> - </object> + <object class="GtkCellRendererText" id="cellrenderertext_general_value"/> + <attributes> + <attribute name="foreground">2</attribute> + <attribute name="markup">1</attribute> + </attributes> </child> </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -543,9 +455,9 @@ each direction. (Default: 0) </property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="label_notebook_config"> + <object class="GtkLabel" id="label_general"> <property name="visible">True</property> - <property name="label" translatable="yes">Configuration</property> + <property name="label" translatable="yes">General</property> </object> <packing> <property name="position">2</property> @@ -554,54 +466,7 @@ each direction. (Default: 0) </property> </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">False</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow_sticky"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <child> - <object class="GtkTreeView" id="treeview_sticky"> - <property name="visible">True</property> - <property name="can_focus">True</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"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_sticky_key"/> - <attributes> - <attribute name="markup">0</attribute> - </attributes> - </child> - </object> - </child> - <child> - <object class="GtkTreeViewColumn" id="treeviewcolumn_sticky_value"> - <property name="title">column</property> - <child> - <object class="GtkCellRendererText" id="cellrenderertext_sticky_value"/> - <attributes> - <attribute name="foreground">2</attribute> - <attribute name="markup">1</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="resize">True</property> - <property name="shrink">False</property> + <property name="position">1</property> </packing> </child> </object> @@ -612,7 +477,6 @@ each direction. (Default: 0) </property> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow_log"> - <property name="height_request">100</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> @@ -622,10 +486,13 @@ each direction. (Default: 0) </property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="model">liststore_log</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_log_timestamp"> <property name="title">Time</property> + <property name="clickable">True</property> <property name="sort_indicator">True</property> <property name="sort_order">descending</property> <property name="sort_column_id">1</property> @@ -666,7 +533,7 @@ each direction. (Default: 0) </property> </child> </object> <packing> - <property name="resize">True</property> + <property name="resize">False</property> <property name="shrink">False</property> </packing> </child> @@ -678,4 +545,46 @@ each direction. (Default: 0) </property> </object> </child> </object> + <object class="GtkAboutDialog" id="aboutdialog"> + <property name="border_width">5</property> + <property name="type_hint">normal</property> + <property name="program_name">garm</property> + <property name="version">0.1</property> + <property name="copyright" translatable="yes">Copyright (C) 2011 Kamran Riaz Khan</property> + <property name="website">http://inspirated.com/</property> + <property name="website_label" translatable="yes">Blog</property> + <signal name="response" handler="on_aboutdialog_response"/> + <child internal-child="vbox"> + <object class="GtkVBox" id="aboutdialog_vbox"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">2</property> + <child internal-child="action_area"> + <object class="GtkHButtonBox" id="aboutdialog_action_area"> + <property name="visible">True</property> + <property name="layout_style">end</property> + </object> + <packing> + <property name="expand">False</property> + <property name="pack_type">end</property> + <property name="position">0</property> + </packing> + </child> + </object> + </child> + </object> + <object class="GtkAction" id="action_quit"> + <property name="label">Quit</property> + <property name="short_label">Quit</property> + <property name="tooltip">Quit</property> + <property name="stock_id">gtk-quit</property> + <signal name="activate" handler="on_action_quit_activate"/> + </object> + <object class="GtkAction" id="action_about"> + <property name="label">About</property> + <property name="short_label">About</property> + <property name="tooltip">About</property> + <property name="stock_id">gtk-about</property> + <signal name="activate" handler="on_action_about_activate"/> + </object> </interface> diff --git a/src/gui/controller.py b/src/gui/controller.py index 854e388..5736def 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -6,7 +6,7 @@ import time from util import log, torTools from connections import connPanel -from gui import logPanel, stickyPanel +from gui import logPanel, generalPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -29,8 +29,8 @@ class GuiController: self.connPanel.pack_widgets() self.connPanel.start() - self.stickyPanel = stickyPanel.StickyPanel(self.builder) - self.stickyPanel.pack_widgets() + self.generalPanel = generalPanel.GeneralPanel(self.builder) + self.generalPanel.pack_widgets() def run(self): window = self.builder.get_object('window_main') @@ -38,6 +38,17 @@ class GuiController: window.show_all() gtk.main() + def on_action_about_activate(self, widget, data=None): + dialog = self.builder.get_object('aboutdialog') + dialog.run() + + def on_aboutdialog_response(self, widget, responseid, data=None): + dialog = self.builder.get_object('aboutdialog') + dialog.hide() + + def on_action_quit_activate(self, widget, data=None): + gtk.main_quit() + def on_window_main_delete_event(self, widget, data=None): gtk.main_quit() diff --git a/src/gui/generalPanel.py b/src/gui/generalPanel.py new file mode 100644 index 0000000..b16cac5 --- /dev/null +++ b/src/gui/generalPanel.py @@ -0,0 +1,123 @@ +""" +General panel. +""" + +import random +import sys +import time + +from collections import deque + +import gobject +import gtk + +from cli.headerPanel import (HeaderPanel as CliHeaderPanel, VERSION_STATUS_COLORS) +from TorCtl import TorCtl +from util import connections, sysTools, gtkTools, uiTools, torTools + +class GeneralPanel(CliHeaderPanel): + def __init__(self, builder): + CliHeaderPanel.__init__(self, None, time.time()) + + self.builder = builder + self.filled = False + + 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() + + liststore = self.builder.get_object('liststore_general') + theme = gtkTools.Theme() + + liststore.clear() + + key = "arm" + value = "%s (%s %s)" % (self.vals['sys/hostname'], self.vals['sys/os'], self.vals['sys/version']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ + self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "black" + key = "Tor" + value = "%s (%s)" % (self.vals['tor/version'], versionColor, self.vals['tor/versionStatus']) + row = (key, value, theme.colors['active']) + liststore.append(row) + + includeControlPort = True + key = "Relaying" + if self.vals["tor/orPort"]: + myAddress = "Unknown" + if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] + elif self.vals["tor/address"]: myAddress = self.vals["tor/address"] + + dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" + + value = "%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) + else: + if self._isTorConnected: + value = "Disabled" + else: + statusTime = torTools.getConn().getStatus()[1] + + if statusTime: + statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) + else: statusTimeLabel = "" + + value = "%s%s" % ("Tor Disconnected", statusTimeLabel) + includeControlPort = False + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Control Port" + if includeControlPort: + if self.vals["tor/isAuthPassword"]: authType = "password" + elif self.vals["tor/isAuthCookie"]: authType = "cookie" + else: authType = "open" + + authColor = "red" if authType == "open" else "green" + value = "%s (%s)" % (self.vals['tor/controlPort'], authColor, authType) + row = (key, value, theme.colors['active']) + liststore.append(row) + + + if self.vals["stat/rss"] != "0": memoryLabel = uiTools.getSizeLabel(int(self.vals["stat/rss"])) + else: memoryLabel = "0" + + if self.vals["tor/startTime"]: + if self.isPaused() or not self._isTorConnected: + uptimeLabel = uiTools.getShortTimeLabel(self.getPauseTime() - self.vals["tor/startTime"]) + else: + uptimeLabel = uiTools.getShortTimeLabel(time.time() - self.vals["tor/startTime"]) + + key = "CPU" + value = "%s%% Tor, %s%% arm" % (self.vals["stat/%torCpu"], self.vals["stat/%armCpu"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Memory" + value = "%s (%s%%)" % (memoryLabel, self.vals["stat/%mem"]) + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "PID" + value = "%s" % (self.vals["tor/pid"] if self._isTorConnected else "") + row = (key, value, theme.colors['active']) + liststore.append(row) + + key = "Uptime" + value = uptimeLabel + row = (key, value, theme.colors['active']) + liststore.append(row) + + self.valsLock.release() + diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 250503d..c7d24bb 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -46,6 +46,8 @@ class GraphStats(TorCtl.PostEventListener): def _pack_graph_widget(self, name): graph = CaGraph() + graph.set_size_request(200, 200) + placeholder = self.builder.get_object('placeholder_graph_%s' % name) placeholder.pack_start(graph) diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py deleted file mode 100644 index 145c452..0000000 --- a/src/gui/stickyPanel.py +++ /dev/null @@ -1,123 +0,0 @@ -""" -Sticky panel. -""" - -import random -import sys -import time - -from collections import deque - -import gobject -import gtk - -from cli.headerPanel import (HeaderPanel as CliHeaderPanel, VERSION_STATUS_COLORS) -from TorCtl import TorCtl -from util import connections, sysTools, gtkTools, uiTools, torTools - -class StickyPanel(CliHeaderPanel): - def __init__(self, builder): - CliHeaderPanel.__init__(self, None, time.time()) - - self.builder = builder - self.filled = False - - 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() - - liststore = self.builder.get_object('liststore_sticky') - theme = gtkTools.Theme() - - liststore.clear() - - key = "arm" - value = "%s (%s %s)" % (self.vals['sys/hostname'], self.vals['sys/os'], self.vals['sys/version']) - row = (key, value, theme.colors['active']) - liststore.append(row) - - versionColor = VERSION_STATUS_COLORS[self.vals["tor/versionStatus"]] if \ - self.vals["tor/versionStatus"] in VERSION_STATUS_COLORS else "black" - key = "Tor" - value = "%s (%s)" % (self.vals['tor/version'], versionColor, self.vals['tor/versionStatus']) - row = (key, value, theme.colors['active']) - liststore.append(row) - - includeControlPort = True - key = "Relaying" - if self.vals["tor/orPort"]: - myAddress = "Unknown" - if self.vals["tor/orListenAddr"]: myAddress = self.vals["tor/orListenAddr"] - elif self.vals["tor/address"]: myAddress = self.vals["tor/address"] - - dirPortLabel = ", Dir Port: %s" % self.vals["tor/dirPort"] if self.vals["tor/dirPort"] != "0" else "" - - value = "%s%s%s" % (self.vals["tor/nickname"], " - " + myAddress, ":" + self.vals["tor/orPort"], dirPortLabel) - else: - if self._isTorConnected: - value = "Disabled" - else: - statusTime = torTools.getConn().getStatus()[1] - - if statusTime: - statusTimeLabel = time.strftime("%H:%M %m/%d/%Y, ", time.localtime(statusTime)) - else: statusTimeLabel = "" - - value = "%s%s" % ("Tor Disconnected", statusTimeLabel) - includeControlPort = False - row = (key, value, theme.colors['active']) - liststore.append(row) - - key = "Control Port" - if includeControlPort: - if self.vals["tor/isAuthPassword"]: authType = "password" - elif self.vals["tor/isAuthCookie"]: authType = "cookie" - else: authType = "open" - - authColor = "red" if authType == "open" else "green" - value = "%s (%s)" % (self.vals['tor/controlPort'], authColor, authType) - row = (key, value, theme.colors['active']) - liststore.append(row) - - - if self.vals["stat/rss"] != "0": memoryLabel = uiTools.getSizeLabel(int(self.vals["stat/rss"])) - else: memoryLabel = "0" - - if self.vals["tor/startTime"]: - if self.isPaused() or not self._isTorConnected: - uptimeLabel = uiTools.getShortTimeLabel(self.getPauseTime() - self.vals["tor/startTime"]) - else: - uptimeLabel = uiTools.getShortTimeLabel(time.time() - self.vals["tor/startTime"]) - - key = "CPU" - value = "%s%% Tor, %s%% arm" % (self.vals["stat/%torCpu"], self.vals["stat/%armCpu"]) - row = (key, value, theme.colors['active']) - liststore.append(row) - - key = "Memory" - value = "%s (%s%%)" % (memoryLabel, self.vals["stat/%mem"]) - row = (key, value, theme.colors['active']) - liststore.append(row) - - key = "PID" - value = "%s" % (self.vals["tor/pid"] if self._isTorConnected else "") - row = (key, value, theme.colors['active']) - liststore.append(row) - - key = "Uptime" - value = uptimeLabel - row = (key, value, theme.colors['active']) - liststore.append(row) - - self.valsLock.release() -

1 0

r24909: {website} dapper is history, wheezy is testing, and all Debians have a (website/trunk/docs/en)
by Peter Palfrader 15 Jul '11

15 Jul '11

Author: weasel Date: 2011-07-15 17:24:09 +0000 (Fri, 15 Jul 2011) New Revision: 24909 Modified: website/trunk/docs/en/debian.wml Log: dapper is history, wheezy is testing, and all Debians have a Tor Modified: website/trunk/docs/en/debian.wml =================================================================== --- website/trunk/docs/en/debian.wml 2011-07-15 12:11:40 UTC (rev 24908) +++ website/trunk/docs/en/debian.wml 2011-07-15 17:24:09 UTC (rev 24909) @@ -16,8 +16,7 @@ -If you're using Debian stable (lenny), unstable (sid), or testing -(squeeze), just run +If you're using Debian just run <tt>apt-get install tor tor-geoipdb</tt> as root. @@ -55,6 +54,7 @@ Here's a quick mapping: <ul> <li> Debian unstable (sid) is "sid"</li> +<li> Debian testing is "wheezy"</li> <li> Debian 6.0 (squeeze) is "squeeze"</li> <li> Debian 5.0 (lenny) is "lenny"</li> <li> Ubuntu 11.04 is "natty"</li> @@ -62,7 +62,6 @@ <li> Ubuntu 10.04 or Trisquel 4.0 is "lucid"</li> <li> Ubuntu 9.10 or Trisquel 3.5 is "karmic"</li> <li> Ubuntu 8.04 is "hardy"</li> -<li> Ubuntu 6.06 is "dapper"</li> </ul> Then add this line to your

1 0

[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>

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] 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] 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] Use treestore and group circuit entries by header, cache the model.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 0b58312fe6b543cef4193c7f1cda36e801b5d36e Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Fri Jul 8 18:32:56 2011 +0500 Use treestore and group circuit entries by header, cache the model. The treestore is updated only if the (local, foreign) tuple for one of the entries is not found in cache. Otherwise, only the time column is updated. --- src/gui/arm.xml | 4 +- src/gui/connections/connPanel.py | 43 ++++++++++++++++++++++++++++++++----- src/starter.py | 2 +- 3 files changed, 40 insertions(+), 9 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index dca5f33..0aafb28 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -59,7 +59,7 @@ </row> </data> </object> - <object class="GtkListStore" id="liststore_conn"> + <object class="GtkTreeStore" id="treestore_conn"> <columns>  <column type="gchararray"/> @@ -432,7 +432,7 @@ <object class="GtkTreeView" id="treeview_conn"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="model">liststore_conn</property> + <property name="model">treestore_conn</property> <property name="headers_visible">False</property> <property name="headers_clickable">False</property> <property name="search_column">0</property> diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index cbabc41..ad57878 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -11,10 +11,10 @@ from collections import deque import gobject import gtk -from cli.connections import connEntry +from cli.connections import circEntry, connEntry from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel from TorCtl import TorCtl -from util import connections, uiTools, torTools +from util import connections, sysTools, uiTools, torTools REFRESH_RATE = 3 @@ -23,8 +23,12 @@ class ConnectionPanel(CliConnectionPanel): CliConnectionPanel.__init__(self, None) self.builder = builder + self.cache = {} - self.resolver = connections.getResolver('tor') + conn = torTools.getConn() + torPid = conn.getMyPid() + torCmdName = sysTools.getProcessName(torPid, "tor") + connections.getResolver(torCmdName, torPid, "tor") gobject.timeout_add(3000, self._fill_entries) @@ -37,8 +41,25 @@ class ConnectionPanel(CliConnectionPanel): label = self.builder.get_object('label_conn_top') label.set_text(self._title) - liststore = self.builder.get_object('liststore_conn') - liststore.clear() + treestore = self.builder.get_object('treestore_conn') + + # first pass checks whether we have enough entries cached to not update the treeview + for (index, line) in enumerate(self._entryLines): + local = "%s:%s" % (line.local.ipAddr, line.local.port) + foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) + cachekey = (local, foreign) + if self.cache.has_key(cachekey): + timeLabel = "%d s" % (time.time() - line.startTime) + treestore.set_value(self.cache[cachekey], 2, timeLabel) + else: + break + + if index == len(self._entryLines) - 1: + return + + treestore.clear() + + headeriter = None for line in self._entryLines: if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): @@ -48,7 +69,17 @@ class ConnectionPanel(CliConnectionPanel): foreign = "%s:%s" % (line.foreign.ipAddr, line.foreign.port) timeLabel = "%d s" % (time.time() - line.startTime) row = (local, foreign, timeLabel, line.baseType, 'black') - liststore.append(row) + + if isinstance(line, circEntry.CircHeaderLine): + currentiter = treestore.append(None, row) + headeriter = currentiter + elif isinstance(line, circEntry.CircLine): + currentiter = treestore.append(headeriter, row) + else: + currentiter = treestore.append(None, row) + + cachekey = (local, foreign) + self.cache[cachekey] = currentiter self.valsLock.release() diff --git a/src/starter.py b/src/starter.py index 1b6049a..5518caa 100644 --- a/src/starter.py +++ b/src/starter.py @@ -30,7 +30,7 @@ import util.uiTools import TorCtl.TorCtl import TorCtl.TorUtil -INCLUDE_GUI = False +INCLUDE_GUI = True LOG_DUMP_PATH = os.path.expanduser("~/.arm/log") DEFAULT_CONFIG = os.path.expanduser("~/.arm/armrc") CONFIG = {"startup.controlPassword": None,

1 0

[arm/master] Return True to keep timeout going.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 9e020cb8e12d682ca74368bda582655bd19957b2 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sat Jul 9 17:00:51 2011 +0500 Return True to keep timeout going. --- src/gui/connections/connPanel.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 9df5142..4f89b30 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -59,7 +59,7 @@ class ConnectionPanel(CliConnectionPanel): index = index + 1 if index == len(self._entryLines): - return + return True treestore.clear()

1 0