- tor-commits - lists.torproject.org

[arm/master] Use gtk theme colors for bandwidth graphs.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit c599d1faca5a66c34a26b7bf5231844e80fb81b7 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Sun Jul 10 19:47:46 2011 +0500 Use gtk theme colors for bandwidth graphs. --- src/gui/graphing/graphStats.py | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/gui/graphing/graphStats.py b/src/gui/graphing/graphStats.py index 0d9ac5f..51150f8 100644 --- a/src/gui/graphing/graphStats.py +++ b/src/gui/graphing/graphStats.py @@ -62,10 +62,14 @@ class GraphStats(TorCtl.PostEventListener): 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] + primaryColor = placeholder.style.fg[gtk.STATE_NORMAL] + secondaryColor = placeholder.style.fg[gtk.STATE_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) } + + series.style.point_radius = 0.0 + series.style.line_color = colors[name] + series.style.fill_color = colors[name] graph.seriess.append(series) graph.grid = CaGraphGrid(graph, 0, 1)

1 0

[arm/master] Display placementLabel instead of timestamp for circuit lines.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 473a6b53d584108492b3a21cc0036117cc02b9b4 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Wed Jul 13 14:44:13 2011 +0500 Display placementLabel instead of timestamp for circuit lines. --- src/gui/connections/circEntry.py | 3 +-- src/gui/connections/connPanel.py | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/gui/connections/circEntry.py b/src/gui/connections/circEntry.py index 11876f8..deb720a 100644 --- a/src/gui/connections/circEntry.py +++ b/src/gui/connections/circEntry.py @@ -35,8 +35,7 @@ class CircLine(circEntry.CircLine, connEntry.ConnectionLine): dst = self.getDestinationLabel(100, includeLocale=True) etc = self.foreign.getNickname() - timeLabel = uiTools.getTimeLabel(time.time() - self.startTime) theme = gtkTools.Theme() - return (dst, etc, timeLabel, self.getType(), theme.colors['insensitive']) + return (dst, etc, self.placementLabel, self.getType(), theme.colors['insensitive']) diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py index 3b980e1..e6a7c5b 100644 --- a/src/gui/connections/connPanel.py +++ b/src/gui/connections/connPanel.py @@ -69,8 +69,9 @@ class ConnectionPanel(CliConnectionPanel): cacheKey = calculateCacheKey(line) if self.cache.has_key(cacheKey): - timeLabel = "%d s" % (time.time() - line.startTime) - treestore.set_value(self.cache[cacheKey], 2, timeLabel) + if not isinstance(line, circEntry.CircLine): + timeLabel = "%d s" % (time.time() - line.startTime) + treestore.set_value(self.cache[cacheKey], 2, timeLabel) else: break

1 0

[arm/master] Derive sticky panel values from CLI HeaderPanel.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 1bd068fab1fae856d7ca64114fcae03c769b9246 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Thu Jul 14 14:08:38 2011 +0500 Derive sticky panel values from CLI HeaderPanel. --- src/gui/arm.xml | 47 ------------------- src/gui/controller.py | 5 ++- src/gui/stickyPanel.py | 118 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 122 insertions(+), 48 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 67409ae..f71d0b7 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -11,53 +11,6 @@  <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes">arm</col> - <col id="1" translatable="yes">orthanc (Linux 2.6.35.11-83.fc14)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Tor</col> - <col id="1" translatable="yes">0.2.1.28 (obsolete)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Relaying</col> - <col id="1" translatable="yes">Disabled</col> - <col id="2" translatable="yes">red</col> - </row> - <row> - <col id="0" translatable="yes">Control Port</col> - <col id="1" translatable="yes">9051 (open)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">CPU Tor</col> - <col id="1" translatable="yes">0.0%</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">CPU arm</col> - <col id="1" translatable="yes">0.0%</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Memory</col> - <col id="1" translatable="yes">20 MB (1.0%)</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">PID</col> - <col id="1" translatable="yes">3980</col> - <col id="2" translatable="yes">black</col> - </row> - <row> - <col id="0" translatable="yes">Uptime</col> - <col id="1" translatable="yes">01:01:34</col> - <col id="2" translatable="yes">black</col> - </row> - </data> </object> <object class="GtkTreeStore" id="treestore_conn"> <columns> diff --git a/src/gui/controller.py b/src/gui/controller.py index a69fdef..854e388 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 +from gui import logPanel, stickyPanel from gui.graphing import bandwidthStats gobject.threads_init() @@ -29,6 +29,9 @@ class GuiController: self.connPanel.pack_widgets() self.connPanel.start() + self.stickyPanel = stickyPanel.StickyPanel(self.builder) + self.stickyPanel.pack_widgets() + def run(self): window = self.builder.get_object('window_main') diff --git a/src/gui/stickyPanel.py b/src/gui/stickyPanel.py new file mode 100644 index 0000000..89b5485 --- /dev/null +++ b/src/gui/stickyPanel.py @@ -0,0 +1,118 @@ +""" +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 + + gobject.timeout_add(3000, self._fill_entries) + + def pack_widgets(self): + pass + + 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 (<span foreground=\"%s\">%s</span>)" % (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 (<span foreground=\"%s\">%s</span>)" % (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() + + return True +

1 0

[arm/master] Remove debug settings for log panel.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 06821d8b3764e78b930777573088e420cb7cb9e3 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Mon Jul 4 16:38:38 2011 +0500 Remove debug settings for log panel. --- src/gui/logPanel.py | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/src/gui/logPanel.py b/src/gui/logPanel.py index 4e95db4..20331ad 100644 --- a/src/gui/logPanel.py +++ b/src/gui/logPanel.py @@ -21,7 +21,7 @@ from cli.logPanel import (expandEvents, setEventListening, getLogFileEntries, RUNLEVEL_EVENT_COLOR = {log.DEBUG: "#C73043", log.INFO: "#762A2A", log.NOTICE: "#222222", log.WARN: "#AB7814", log.ERR: "#EC131F"} -STARTUP_EVENTS = 'A' +STARTUP_EVENTS = 'N3' REFRESH_RATE = 3 class LogPanel: @@ -96,6 +96,9 @@ class LogPanel: self._lastUpdate = time.time() def register_event(self, event): + if not event.type in self.loggedEvents: + return + self.lock.acquire() try: self.msgLog.appendleft(event)

1 0

[arm/master] Fixed crash caused by mismatched keyword arg.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 30f5d6fe6cf44a786bc7f4781cd403028e172026 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jul 5 03:54:54 2011 +0500 Fixed crash caused by mismatched keyword arg. --- src/util/torTools.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 17c54f0..7ea140b 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -1629,7 +1629,7 @@ class Controller(TorCtl.PostEventListener): if self.isAlive(): # fetch the current network status if not provided if not nsList: - try: nsList = self.conn.get_network_status(getIterator=True) + try: nsList = self.conn.get_network_status(get_iterator=True) except (socket.error, TorCtl.TorCtlClosed, TorCtl.ErrorReply): nsList = [] # construct mappings of ips to relay data

1 0

[arm/master] Merge branch 'master' of git://git.torproject.org/arm
by atagar＠torproject.org 15 Jul '11

15 Jul '11

1 0

[arm/master] Initial commit for GUI connection listing.
by atagar＠torproject.org 15 Jul '11

15 Jul '11

commit 05a369b15000e76fbc4cc03bc102786ac0247225 Author: Kamran Riaz Khan <krkhan(a)inspirated.com> Date: Tue Jul 5 15:25:27 2011 +0500 Initial commit for GUI connection listing. Currently derives from the CLI conn panel and lists rudimentary (unstructured) information about circuits for debugging. --- src/gui/arm.xml | 25 +---------------- src/gui/connections/__init__.py | 6 ++++ src/gui/connections/connPanel.py | 56 ++++++++++++++++++++++++++++++++++++++ src/gui/controller.py | 5 +++ 4 files changed, 68 insertions(+), 24 deletions(-) diff --git a/src/gui/arm.xml b/src/gui/arm.xml index 1e3681c..dca5f33 100644 --- a/src/gui/arm.xml +++ b/src/gui/arm.xml @@ -72,29 +72,6 @@  <column type="gchararray"/> </columns> - <data> - <row> - <col id="0" translatable="yes">115.167.31.237:56835</col> - <col id="1" translatable="yes">188.120.245.249:9001 (ru)</col> - <col id="2" translatable="yes">10.7m</col> - <col id="3" translatable="yes">CLIENT</col> - <col id="4" translatable="yes">blue</col> - </row> - <row> - <col id="0" translatable="yes">115.167.31.237:44940</col> - <col id="1" translatable="yes">206.217.215.183:53 (us)</col> - <col id="2" translatable="yes">28.3m</col> - <col id="3" translatable="yes">CLIENT</col> - <col id="4" translatable="yes">blue</col> - </row> - <row> - <col id="0" translatable="yes">127.0.0.1:9051</col> - <col id="1" translatable="yes">127.0.0.1:51665</col> - <col id="2" translatable="yes">30.0m</col> - <col id="3" translatable="yes">CONTROL</col> - <col id="4" translatable="yes">red</col> - </row> - </data> </object> <object class="GtkListStore" id="liststore_config"> <columns> @@ -437,7 +414,7 @@ <child> <object class="GtkLabel" id="label_conn_top"> <property name="visible">True</property> - <property name="label" translatable="yes">2 Clients, 1 Control</property> + <property name="label" translatable="yes">Connections:</property> </object> <packing> <property name="expand">False</property> diff --git a/src/gui/connections/__init__.py b/src/gui/connections/__init__.py new file mode 100644 index 0000000..3102ead --- /dev/null +++ b/src/gui/connections/__init__.py @@ -0,0 +1,6 @@ +""" +Connections. +""" + +__all__ = ["connPanel"] + diff --git a/src/gui/connections/connPanel.py b/src/gui/connections/connPanel.py new file mode 100644 index 0000000..cbabc41 --- /dev/null +++ b/src/gui/connections/connPanel.py @@ -0,0 +1,56 @@ +""" +Connections panel. +""" + +import random +import sys +import time + +from collections import deque + +import gobject +import gtk + +from cli.connections import connEntry +from cli.connections.connPanel import ConnectionPanel as CliConnectionPanel +from TorCtl import TorCtl +from util import connections, uiTools, torTools + +REFRESH_RATE = 3 + +class ConnectionPanel(CliConnectionPanel): + def __init__(self, builder): + CliConnectionPanel.__init__(self, None) + + self.builder = builder + + self.resolver = connections.getResolver('tor') + + gobject.timeout_add(3000, self._fill_entries) + + def pack_widgets(self): + pass + + def _fill_entries(self): + self.valsLock.acquire() + + label = self.builder.get_object('label_conn_top') + label.set_text(self._title) + + liststore = self.builder.get_object('liststore_conn') + liststore.clear() + + for line in self._entryLines: + if isinstance(line, connEntry.ConnectionLine) and line.isUnresolvedApp(): + self._resolveApps() + + local = "%s:%s" % (line.local.ipAddr, line.local.port) + 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) + + self.valsLock.release() + + return True + diff --git a/src/gui/controller.py b/src/gui/controller.py index 5f1712c..a69fdef 100644 --- a/src/gui/controller.py +++ b/src/gui/controller.py @@ -5,6 +5,7 @@ import thread import time from util import log, torTools +from connections import connPanel from gui import logPanel from gui.graphing import bandwidthStats @@ -24,6 +25,10 @@ class GuiController: self.bwStats = bandwidthStats.BandwidthStats(self.builder) self.bwStats.pack_widgets() + self.connPanel = connPanel.ConnectionPanel(self.builder) + self.connPanel.pack_widgets() + self.connPanel.start() + def run(self): window = self.builder.get_object('window_main')

1 0

[obfsproxy/master] don't reinvent offsetof
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 17e8cb0097f31374e7b44e957b026f8ed11f5e0f Author: Zack Weinberg <zackw(a)panix.com> Date: Thu Jul 14 13:23:58 2011 -0700 don't reinvent offsetof --- src/network.c | 4 ++-- src/util.h | 12 +++--------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/network.c b/src/network.c index ea06bc2..6a8afa6 100644 --- a/src/network.c +++ b/src/network.c @@ -93,7 +93,7 @@ close_all_connections(void) { /** Traverse the dll and close all connections */ while (conn_list.head) { - conn_t *conn = UPCAST(conn_t, dll_node, conn_list.head); + conn_t *conn = DOWNCAST(conn_t, dll_node, conn_list.head); conn_free(conn); /* removes it */ } assert(!n_connections); @@ -169,7 +169,7 @@ free_all_listeners(void) /* Iterate listener doubly linked list and free them all. */ while (listener_list.head) { - listener_t *listener = UPCAST(listener_t, dll_node, listener_list.head); + listener_t *listener = DOWNCAST(listener_t, dll_node, listener_list.head); listener_free(listener); } diff --git a/src/util.h b/src/util.h index ff9df22..b526dbf 100644 --- a/src/util.h +++ b/src/util.h @@ -6,7 +6,7 @@ #define UTIL_H #include <stdarg.h> /* for va_list */ -#include <stddef.h> /* for size_t etc */ +#include <stddef.h> /* size_t, offsetof, NULL, etc */ #ifndef __GNUC__ #define __attribute__(x) /* nothing */ @@ -37,14 +37,8 @@ int obfs_snprintf(char *str, size_t size, /***** Doubly Linked List stuff. *****/ -#define OFFSETOF(container_type, element) \ - (((char*)&((container_type*)0)->element) - ((char*) ((container_type*)0))) - -#define UPCAST(container_type, element, ptr) \ - (container_type*) ( \ - ((char*)ptr) - OFFSETOF(container_type, element) \ - ) - +#define DOWNCAST(container_type, element, ptr) \ + (container_type*)( ((char*)ptr) - offsetof(container_type, element) ) /** A doubly linked list node. [algorithms ripped off Wikipedia (Doubly_linked_list) ] */

1 0

[tor/master] Change GETINFO fingerprint to look at server_mode, not my_descriptor
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 5000e59b5ff4234c6119c5ac0e9f419430c8b699 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 13 12:44:41 2011 -0400 Change GETINFO fingerprint to look at server_mode, not my_descriptor It's possible for us to be a server and have a fingerprint without having yet generated a descriptor. Fixes bug 3577; bugfix on 0.2.0.1-alpha --- changes/bug3577 | 4 ++++ src/or/control.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/changes/bug3577 b/changes/bug3577 new file mode 100644 index 0000000..6335272 --- /dev/null +++ b/changes/bug3577 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Allow GETINFO fingerprint to return a fingerprint even when + we have not yet built a router descriptor. Fixes bug 3577; + bugfix on 0.2.0.1-alpha. diff --git a/src/or/control.c b/src/or/control.c index da0a95d..d33d337 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1394,14 +1394,14 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "dir-usage")) { *answer = directory_dump_request_log(); } else if (!strcmp(question, "fingerprint")) { - routerinfo_t *me = router_get_my_routerinfo(); - if (!me) { + crypto_pk_env_t *server_key; + if (!server_mode(get_options())) { *errmsg = "No routerdesc known; am I really a server?"; return -1; } + server_key = get_server_identity_key(); *answer = tor_malloc(HEX_DIGEST_LEN+1); - base16_encode(*answer, HEX_DIGEST_LEN+1, me->cache_info.identity_digest, - DIGEST_LEN); + crypto_pk_get_fingerprint(server_key, *answer, 0); } return 0; }

1 0

[tor/master] Improve error msg on failed getinfo fingerprint
by nickm＠torproject.org 14 Jul '11

14 Jul '11

commit 2e34416c6db20156619e80975e46c8b1030bb3a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 14 17:19:52 2011 -0400 Improve error msg on failed getinfo fingerprint --- src/or/control.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/control.c b/src/or/control.c index d33d337..954da65 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -1396,7 +1396,7 @@ getinfo_helper_misc(control_connection_t *conn, const char *question, } else if (!strcmp(question, "fingerprint")) { crypto_pk_env_t *server_key; if (!server_mode(get_options())) { - *errmsg = "No routerdesc known; am I really a server?"; + *errmsg = "Not running in server mode"; return -1; } server_key = get_server_identity_key();

1 0