tor-commits

tor-commits@lists.torproject.org

1 participants
212429 discussions

r24662: {} Dropping arm's svn repository (thanks to Sebastian it's now (in arm: . release trunk)
by Damian Johnson 20 Apr '11

20 Apr '11

Author: atagar Date: 2011-04-20 15:46:23 +0000 (Wed, 20 Apr 2011) New Revision: 24662 Added: arm/release/README arm/trunk/README Removed: arm/branches/ arm/release/ChangeLog arm/release/LICENSE arm/release/README arm/release/arm arm/release/arm.1 arm/release/armrc.sample arm/release/install arm/release/setup.py arm/release/src/ arm/resources/ arm/trunk/ChangeLog arm/trunk/LICENSE arm/trunk/README arm/trunk/arm arm/trunk/arm.1 arm/trunk/armrc.sample arm/trunk/install arm/trunk/setup.py arm/trunk/src/ Log: Dropping arm's svn repository (thanks to Sebastian it's now in git: https://gitweb.torproject.org/arm.git) Deleted: arm/release/ChangeLog =================================================================== --- arm/release/ChangeLog 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/release/ChangeLog 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,580 +0,0 @@ -CHANGE LOG - -4/4/11 - version 1.4.2 (r24555) -This release chiefly consists of a fully reimplemented connection panel. Besides being a sane, maintainable implementation this includes numerous new features and improvements like full circuit paths, applications involved for local connections, and better type identification. - - * added: full rewrite of the connection panel, providing: - o listing the full paths involved in active circuits - o identification of socks, hidden service, and controller applications (arm, vidalia, polipo, etc) - o identification of exit connections with the common usage for the port they're using - o display of the local -> internal -> external address when room is available (original patch by Fabian Keil) - o better accuracy and performance in identifying client and directory connections - o marking the uptimes for initial connections (arm only tracks connection uptimes since starting, so these entries are just minimum durations) - o lazily loading the initial IP -> fingerprint mappings to improve the startup time - o using the circuit-status to disambiguating multiple relays on the same IP address - o smarter space utilization, filling in smaller columns if there isn't room for higher priority but larger entries - o connection details popup changes: - + using the consensus exit policies rather than the longer descriptor versions when available - + displaying connection details no longer freezes the rest of the display - + detail panel uses the full screen width and is dynamically resizable - + more resilient to missing descriptors - * change: hiding most tor config values by default (idea by arma) - * change: dropping warning suggesting that users set the FetchUselessDescriptors option (suggestion by Sebastian and others) - * change: always starting the bandwidth field from zero rather than using the state file total, which only contains the last day's worth of data (thanks to guilhem) - * change: suggesting authentication and giving steps for it in the readme (suggestion by Sebastian) - * change: caching config display lines, which reduces the CPU usage when scrolling by around 40% - * change: added summaries for the remaining tor configuration options - * change: using a dedicated enum class rather than tuple sets - * fix: torrc validation requires 'GETINFO config-text' which was introduced in Tor verison 0.2.2.7 (caught by Sjon, talion, and torland, https://trac.torproject.org/projects/tor/ticket/2501) - * fix: off-by-one issue with the displayed line numbers for torrc errors (caught by Sjon) - * fix: bin function wasn't available before python 2.6 (caught by Paul Menzel) - * fix: mis-parsing family entries when there's no entry after the comma (caught by StrangeCharm, https://trac.torproject.org/projects/tor/ticket/2414) - * fix: preventing SOCKS and CONTROL connections from being expanded (patch by Fabian Keil) - * fix: disabling name resolution for application queries to avoid leaking to resolvers (patch by Fabian Keil) - * fix: reversing src and dst addresses of SOCKS and CONTROL connections (caught by Fabian Keil) - * fix: changing the 'APPLICATION' type to 'SOCKS' since the previous label was too long (caught by Fabian Keil) - * fix: crashing issue from unknown relay nicknames (caught by krkhan) - * fix: concurrency bug occasionally causing "syshook" stacktraces when shutting down - * fix: header panel displayed the wrong IP address if it changed since we first started (https://trac.torproject.org/projects/tor/ticket/2776) - * fix: unchecked OSError could cause us to crash when making directories (for instance if there was a permissions issue) - * fix: the availability check for bsd resolvers was broken, probably causing resolution to fail for a few seconds on that platform - * fix: dropping the pointless 'Log notice stdout' entry provided by config-text queries (https://trac.torproject.org/projects/tor/ticket/2362) - * fix: taking DirServer and AlternateDirAuthority into account when determining the directory authorities - * fix: consuming a little extra space in the connection panel when scrollbars aren't visible - * fix: dropping the deprecated 'features.config.descriptions.persistPath' config option - * fix: failed connection attempts to the control port were generating zombie connections (https://trac.torproject.org/projects/tor/ticket/2812) - * fix: concurrency bug in joining on the TorCtl thread when tor shut down - * fix: the 'startup.dataDirectory' config option was being ignored - * fix: recognizing the proper private ip ranges of the 172.* block - * fix: missing 'is default' option from config sort ordering - * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) - -1/7/11 - version 1.4.1 (r24054) -Platform specific enhancements including BSD compatibility and vastly improved performance on Linux. - - * added: querying the proc contents when able for tor resource and connection samplings to *greatly* reduce arm's resource usage (many thanks to psutil) - * added: vastly improved BSD compatibility, thanks to patches by Fabian Keil - o pid resolution via pgrep (all platforms) and sockstat (bsd only) - o connection resolution via sockstat (all platforms) and procstat (bsd only) - o autodetecting the path prefix for FreeBSD jails - * added: displaying summaries of the options on the configuration panel (idea by Sebastian) - * added: arm cpu usage to the header panel and logs (with an estimate for system call usages) - * added: testing script for checking connection resolution performance, connection dumps, and the glyph demo - * added: option to dump arm debug logs (better failsafe option) - * change: incrementing the uptime field of the header panel each second - * change: centralizing arm resources in ~/.arm (suggested by Sebastian and also thanks to feedback from rransom) - * change: using exponential backoff of ps/proc resource resolutions when calls fail or tor isn't running - * change: reordered resolvers by order of performance - * change: when tor's man page is unavailable falling back to descriptions provided with arm (often the case with tbb) - * change: dropping support for graphing of custom ps attributes (feature was never used, kinda pointless, and incompatible with the proc enhancement) - * fix: providing proper cpu samplings rather than an average over the life of the process - * fix: expanding relative paths for the authentication cookie (mostly a problem for tbb instances) - * fix: crashing error when querying hidden service parameters (caught by StrangeCharm, fixed by katmagic and chiiph) - * fix: initially built diff differed from rebuilt version since it was missing the pycompat (caught by weasel) - * fix: startup script wasn't handling unusual paths, such as with spaces and dashes (caught by weasel) - * fix: startup script was forking the final process instead of calling exec (caught by weasel) - * fix: log entries weren't being bracketed by date dividers when no scroll bars were visible (caught thanks to twur) - * fix: workaround for config-text providing Log entries regardless of if it matches the default (caught thanks to Trystero) - * fix: config validation mistakenly thought that Tor stripped spaces from CSV getconf responses (caught by murble) - * fix: presenting a text input field with python 2.5 would crash (caught by murble) - * fix: reloading torrc contents when a sighup is issued (caught by StrangeCharm) - * fix: modifying lsof resolution to work with additional platforms (patch by Fabian Keil) - * fix: dropping the locale for internal connections (patch by Fabian Keil) - * fix: labeling connections to our socks port as being client connections (caught by Fabian Keil) - * fix: skipping internal -> external address translation when the external address is private (caught by Fabian Keil) - * fix: suppressing superfluous lsof warnings (patch by Hans Schnehl) - * fix: when the pid was unavailable some resolvers failed to work - * fix: including udp connection results (needed since exits proxy dns traffic) - * fix: crashing issue when nickname was undefined but displayed on the connection panel - * fix: concurrency issue caused the first connection resolution to often not have the pid - * fix: connection resolution wasn't finding results if tor was running under a different name - * fix: brought all Linux connection resolvers into parity (established tcp connections only) - * fix: commands with quoted pipes were being mis-parsed by the sysTools' call function - * fix (1/11/11, r24064): including platform, python version, and arm/tor configurations in debug dumps - * fix (1/11/11, r24064): properly parse the ps field when displaying decimal seconds (patch by Fabian) - * fix (1/11/11, r24064): error when initial resource lookups fail (caught by Trystero) - * fix (1/12/11, r24075): decimal seconds in the ps uptime field were being misparsed (patch by Fabian) - * fix (1/15/11, r24092): adding a --docPath argument to help Gentoo ebuilds (https://bugs.gentoo.org/349792) - -11/27/10 - version 1.4.0 (r23873) -Introducing a new page for managing tor's configuration, along with several other improvements. - - * added: editor for the tor configuration, providing: - o a simple method for setting config values and saving the new torrc - o descriptions and usage information for the tor configuration options, fetched from its man page - o color and bolding to indication option categories and if they're default or custom values - o sorting by any of the config attributes - * change: numerous revisions in preparation for being included in debian, thanks to weasel - o moved deb/rpm build resources out of the source repository and added helper scripts - o moved the arm install location to /usr/share/arm - o purging the autogenerated egg file from the deb build - o using temporary file utility for man page compression to avoid potential security issues (thanks to asn) - o including dh_pysupport flag so it'll recognize the private python module (thanks to Emilio Pozuelo Monfort) - o small revisions to several bits of debian metadata - * change: full rewrite of the log panel, providing: - o added: scrollbar and scrolling by displayed content rather than line numbers - o added: checking for torrc entries that are pointless due to matching the default value - o added: validation warning when custom entries are missing from the torrc - o added: handling for the multiline torrc entry support that was added in tor 0.2.2.17-alpha - o change: simplified and expanded on the config display and validation (performance improvements, human friendly units for torrc corrections, etc) - o fix: torrc validation didn't recognize 'second' and 'byte' arguments - o fix: scrolling was buggy if comments were being stripped - o fix: more helpful messages for validation errors - o fix: unnecessary whitespace was being stripped - * added: INFO level logging for the arm startup time - * change: removing all references to the controller password after we've connected to tor (request by ioerror) - * change: using curses.textpad to improve text fields (supports arrow keys, emacs keybindings, etc) - * change: revised the arm config interface (simplified and expanded to include maps) - * fix: verbose logging was causing the application to freeze due to an n^2 deduplication implementation, disabling this feature for now when it takes too long (caught by NightMonkey) - * fix: wasn't loading the settings.cfg if starting starter from the src directory (caught by NightMonkey) - * fix: displaying empty conf contents caused crashes when calling math.log10(0) (caught by NightMonkey) - * fix: persisting results from scraping the man page to greatly reduce startup time (idea by nickm) - * fix: path for the sample armrc was wrong in the man page (caught by weasel) - * fix: the arm starter was only executable from the arm directory - * fix: not all worker threads were daemons, causing the process to persist in a broken state after exceptions and when quitting via ctrl+c - * fix: custom armrcs resulted in the parsing config options being unavailable - * fix: rounding error in rendering the scrollbar, causing it to shrink a line when at the bottom - * fix: crashing issue when the 'queries.ps.rate' config value was undefined and the stats graph was displayed - * fix: making the interface more resilient to being resized while popups are visible - * fix: log panel wasn't respecting the prepopulate* log level config options - * fix: off by one error when wrapping lines in the log panel - * fix (11/30/10, r23882): install script was failing to make the temporary directory for the compressed man page - * fix (11/30/10, r23882): a torrc validation log entries had a typo - -10/6/10 - version 1.3.7 (r23439) -Numerous improvements, most notably being an expanded log panel, installer, and deb/rpm builds. - - * added: installation/removal scripts and man page (thanks to kaner) - * added: scripts and resources for making deb and rpm releases (thanks to ioerror, and also requested by helmut) - * added: path prefix option for chroot jails (requested by asn) - * added: customizable graph size (requested by voidzero) - * added: incremental y-axis measurements to the graph (requested by voidzero) - * added: caching for static GETINFO parameter - * added: logging for the refresh rate metric - * change: full rewrite of the log panel, providing: - o dividers for the date, bordering all events that occurred on the same day - o hiding duplicate log entries (feature request by asn) - o coalescing updates if they're numerous, such as running at the DEBUG runlevel - o providing a notice if tor supports event types that arm doesn't, and logging them as the 'UNKNOWN' type - o condensing the label for runlevel event ranges further if they're identical for multiple types - o options for: - + saving logged events to a file, either via snapshots or running persistence - + presenting torctl events of arbitrary runlevels - + clearing the event log - + maximum lines displayed from individual log entries - + cropping based on time (requested by voidzero) - o numerous performance improvements (for log prepopulation, determining the content length, caching for helper functions, etc) - o minor bug fixes including: - + added handling for BUILDTIMEOUT_SET events - + dropping brackets from label if no events are being logged - + merging tor and arm backlogs according to timestamps - + regex matches were failing for multiline log entries - * change: using PidFile entry to fetch pid if available (idea by arma) - * change: dropping irrelevant information from the header when not running as a relay - * change: updated torctl version to the current git head release - * change: measuring by bits for transfer rates (config can set it back to bytes) - * change: home/end keys jump to start/end of all scroll areas (request by dun) - * change: trimmed last couple letters off downloaded/uploaded labels (requested by asn) - * change: dropping the 'frequentRefresh' parameter in favor of just doing refreshes when there's new graph stats available - * fix: shifting bandwidth prepopulation by a sampling interval to account for tor's internal behavior (thanks to voidzero, nickm, arma, and Sebastian) - * fix: making rdns resolution disabled by defaut due to possible connection disclosure to upstream resolver (thanks to Sebastian) - * fix: skipping bandwidth prepopulation if not running as a relay (caught by arma) - * fix: bandwidth stats above the graph weren't getting reset by sighups (caught by voidzero) - * fix: config and connection panels were failing to parse a torrc with tabs (caught by voidzero) - * fix: remapping torrc aliases so GETCONF calls don't fail (caught by voidzero) - * fix: crashing error in bandwidth panel for wide screen displays (caught by cjb) - * fix: changing debian arch to all rather than any (suggestion by murb) - * fix: had case sensitive check for the torrc logging types (caught by asn) - * fix: crashing error when ExitPolicy was undefined (caught by asn) - * fix: dumping a stacktrace to /tmp and exiting immediately if exceptions are raised while redrawing - * fix: connection panel failed to handle family entries identified by its nickname - * fix: race condition between heartbeat detection and getting the first BW event - * fix: refreshing after popups to make the interface seem more responsive - * fix: crashing and minor display issues if orport was left unset - * fix (10/7/10, r23463): crashing from type issue in the graph panel (caught by tomb) - -6/7/10 - version 1.3.6 (r22617) -Rewrite of the first third of the interface, providing vastly improved performance, maintainability, and a few very nice features. This improved the refresh rate (which is also related to system resource usage) from 30ms to 4ms (an 87% improvement). - - * added: settings are fetched from an optional armrc (update rates, controller password, caching, runlevels, etc) - * added: system tools util providing simplified usage, suppression of leaks to stdout, logging, and optional caching - * added: wrapper for accessing TorCtl providing: - o client side caching for commonly fetched relay information (fingerprint, descriptor, etc) - o singleton accessor and convenience functions, simplifying interface code - o wrapper allowing reattachment to new controllers (ie, arm still works if tor's stopped then restarted - still in the works) - * change: full rewrite of the header panel, providing: - o notice for when tor's disconnected (with time-stamp) - o lightweight redrawing (smarter caching and moved updating into a daemon thread) - o more graceful handling of tiny displays - * change: rewrite of graph panel and related stats, providing: - o prepopulation of bandwidth information from the state file if possible - o observed and measured bandwidth stats (requested by arma) - o graph can be configured to display any numeric ps stat - o third option for graphing bounds (restricting to both local minima and maxima) - o substantially reduced redraw rate and making use of cached ps parameters (reducing call volume) - * fix: preventing 'command unavailable' error messages from going to stdout, which disrupts the display (caught by sid77) - * fix: removed -p option due to being a gaping security problem (caught by ioerror and nickm) - * fix: crashing issue if TorCtl reports TorCtlClosed before the first refresh (caught by Tas) - * fix: preventing the connection panel from initiating or resetting while in blind mode (caught by micah) - * fix: ss resolution wasn't specifying the use of numeric ports (caught by data) - * fix: parsing error when ExitPolicy is undefined (caught by Paul Menzel) - * fix: revised sleep pattern used for threads, greatly reducing the time it takes to quit - * fix: bug in defaulting the connection resolver to something predetermined to be available - * fix: stopping connection resolution (and related failover message) when tor's stopped - * fix: crashing issue when trying to resolve addresses without network connectivity - * fix: forgot to join on connection resolver when quitting - * fix: revised calculation for effective bandwidth rate to take MaxAdvertisedBandwidth into account - -4/8/10 - version 1.3.5 (r22148) -Utility and service rewrite (refactored roughly a third of the codebase, including revised APIs and much better documentation). - - * added: centralized logging utility for handling arm events, simplifying several parts of the interface - * added: rewrote connection resolver, including: - o fallback support for 'ss' and 'lsof' (requested by dun, John Case, and Christopher Davis) - o readjusts resolution rate if calls prove burdensome - o ui option for selecting mode of resolution - * added: rewrote hostname resolver, including: - o optional resolution via socket module (seems worse so disabled by default... pity) - o non-blocking thread safety - o extra error info - * change: revised curses wrapper utilities (plus some hacks of the interface to accommodate it) - * fix: issuing resets via RELOAD signal rather than sighup (thanks to Sebastian for pointing this out) - * fix: taking into account potential None values when running get_option on arbitrary values (caught by pipe and enki) - * fix: crashing problem if use_default_colors() calls failed (caught by sid77) - * fix: removed workaround for mysterious torrc validation bug (was accidentally already fixed - thanks to dun for lending a test environment) - * fix: size and time labels weren't doing integer truncation (rounding was unintended and frustratingly difficult to get rid of) - * fix: hack to prevent log panel from drawing before being positioned - * fix: arm crashed if torrc was an empty file - * fix: wasn't consistently bolding help keys - -3/7/10 - version 1.3.4 (r21852) -Weekend bugfix bundle. - - * added: returned option to reload torrc and added option to issue a sighup - * fix: header panel wasn't interpreting multi-line exit policies (caught by dun) - * fix: substantial display bug when stripping comments and torrc is bigger than the panel (caught by Paul Menzel) - * fix: deb specific hack for estimating the file descriptor limit was broken (caught by Paul Menzel) - * fix: skip printing stack trace in case of keyboard interrupt - * fix: updated listing of directory authorities (for tor version 0.2.1.24) - * fix: several uncaught exceptions when the network consensus couldn't be fetched - * fix: torrc comment stripping wasn't removing comments on the same lines as commands - * fix: torrc validation was failing under some conditions for CSV values (like ExitPolicy) - * fix (3/9/10, r21888): initializing error when processing family connections (caught by dun) - * fix (4/7/10, r22134): scrubbing wrong data for inbound connections (caught by waltman) - -2/27/10 - version 1.3.3 (r21772) -Hiding client/exit information to address privacy concerns and fixes for numerous issues brought up in irc. - - * added: scrubbing connection details of possible client and exit connections - * change: providing file descriptions in README, updated known issues and future plans in TODO - * change: added precision for bandwidth cap and burst if uneven values (requested by mete1989) - * fix: HiddenService* parameters fetched via a special option (caught by dun, karsten, and grumpy3) - * fix: workaround for os specific torrc validation bug - unfortunately haven't managed to repro yet so no fix (caught by grumpy3, Tas, and dun) - * fix: checking for python curses bindings at startup (caught by dun) - * fix: import error - TorCtl and socket missing from confPanel.py (caught by grumpy3) - * fix: showing external ip in connection panel rather than local nat address (caught by mete1989) - * fix: raised minimum width at which graph stats are displayed beside label (caught by dun) - * fix: wasn't treating "accept *" and "reject *" as catch-all policies - * fix: wasn't resizing graph panel properly in case of a sighup - -2/14/10 - version 1.3.2 (r21646) -Refactoring goodness and bug fixes. - - * change: revised curses utilities to further simplify interface implementations - * change: substantial layout changes (adding util and init packages) and including a copy of the gpl - * fix: bug with handing of DST for accounting's 'Time to reset' (patch provided by waltman) - * fix: header and connection panels weren't accounting for having ORListenAddress set (caught by waltman) - * fix: crashing bug when shrank too much for scrollbars to be drawn - * fix: couple system commands weren't redirecting their stderr to /dev/null - -2/7/10 - version 1.3.1 (r21580) -Had enough of a siesta - getting back into development beginning with a rewrite if the starter. - - * added: made authentication a little smarter, using PROTOCOLINFO to autodetect authentication type and cookie location - * change: made 'blind mode' (disables connection queries) a startup option rather than flag in source (request by Sebastian) - * change: all log events (including arm) are now set via character flags, with TorCtl events log as their own toggleable type - * change: starting log label with runlevel events, condensing if logging a range - * change: simplifying command line parsing via getopt - * fix: blind mode now prevents all netstats (including connection counts and halting resolver thread), improving performance - -11/29/09 - version 1.3.0 (r21062) -Weekend bugfix bundle. - - * added: most commands can be immediately executed from the help page (feature request by arma) - * fix: truncating header's version fields if too long (caught by hexa) - * fix: file descriptor dialog now provides a wider variety of error messages in case of failure - * fix: offset issue in connections listing when scroll bar was visible - * fix: removing family connections from listing when control port is closed - * fix: preventing TorCtl startup issues from going to stdout (duplicates warnings) - -11/8/09 - version 1.2.2 (r20927) -This will be the last update for a while since I'm about to start a new job. - - * added: including family relays on connections listing - * added: file descriptors dialog (stats and scrollable listing) - * change: logs warning if torrc fails to load - * fix: size and time labels used in torrc are expanded for validation - * fix: duplicate torrc entries weren't being detected if not erroneous - * fix: crashing issue when cleaning up hostname cache - * fix: stretching connection lines to fill full screen - -10/21/09 - version 1.2.1 (r20814) -Substantial bundle of changes including torrc validation, improved arm event logging, and numerous bug fixes. - - * added: verifies loaded torrc consistency against tor's actual state (gives warning and providing corrections) - * added: checks for torrc entries that are irrelevant due to duplication (gives notices and highlights) - * added: log provides TorCtl events (hack... so ugly...) - * added: option for logging runlevel events of arm, tor, or both - * added: ARM-DEBUG event for netstat query time - * added: providing progress bar when resolving a batch of hostnames - * change: providing prompt notice when tor's control port is closed - * fix: limiting pre-loaded events to this tor instance - * fix: limits log entries used to pre-load events (big logs caused issue with startup time) - * fix: properly closing TorCtl when quitting (was occasionally screwing up terminal) - * fix: at several points TorCtlClosed exceptions were uncaught, causing crashes when tor was closed - * fix: netstat and geoip failures were being noisy when tor quits - * fix: bug in tracking connection counts if tor quits when paused - * fix: sighup wasn't resetting all relevant internal variables - * fix: pausing bypassed connection sorting - -10/16/09 - version 1.2.0 (r20798) -Resolving a few small issues that bugged me. - - * change: using log file to pre-populate events if available - * change: asks for confirmation when quitting - * change: provides warning when tor's descriptors won't be updated - * change: event log now allows for multi-line messages - * fix: occasional crashing error concerning connection cache when paused - * fix: issue with tracking connection times when paused or not visible - -9/28/09 - version 1.1.3 (r20678) -More issues discussed on irc. - - * fix: made netstat lookups a best-effort service, separate from draw thread (caught by arma and StrangeCharm) - * fix: using ps as final fallback if otherwise unable to determine pid (suggested by Sebastian) - * fix: appends tor's pwd if torrc path is relative (caught by arma) - -9/27/09 - version 1.1.2 (r20674) -Few issues discussed on irc. - - * added: changelog and cleaned up todo documents (requested by arma) - * added: option in controller.py to disable connection panel (feature request by Sebastian) - * fix: failed to work on osx and bsd due to crashes after failed system calls (caught by Sebastian and Christopher Davis) - * fix: reloading static data in bandwidth panel after HUP (caught by hexa) - * fix: couple alignment issues with the connection listings - -9/23/09 - version 1.1.1 (r20655) -Bundle of semi-low hanging fruit, including a few issues discussed on irc. - - * added: showing extra parameters in connection listings if room's available - * added: identifying directory server connections - * change: providing an error message if running an incompatible python version (issue spotted by arma) - * change: giving arm a version to help in bug reports - * change: minor tweak to the wording of a faq entry (requested by Sebastian) - * fix: wasn't accounting for RelayBandwidthRate/Burst in effective bandwidth (caught by hexa and arma) - * fix: timing issue when shutting down (caught by arma) - * fix: couple issues with connection time being tracked when paused - * fix: preserving old results when netstat fails - -9/6/09 - r20493 -Several substantial features (last tasks for arm's todo list). - - * added: scroll bars for connections listing and event log - * added: made log scrollable (feature request by StrangeCharm) - * added: regular expression filtering for log (feature request by StrangeCharm) - * added: connection uptimes (time since connection was first made) - * added: identifying client from server connections and providing popup for client circuits - * added: graph for system resource usage (cpu/memory) - * change: removed cursor toggling option for connection page - * fix: minor display issue when changing event types - -8/22/09 - r20354 -Several fixes and changes, mostly concerning the graph panel and making better use of screen real estate. - - * added: labeled the graph's x-axis and reordered the information with changes omitted for small (tty sized) terminals (feature request by StrangeCharm) - * added: doubling up contents of header panel in case of wide screens to take advantage of added space - * added: exit policy to header if a wide display - * change: added precision for bandwidth measurements - * change: using "orconn-status" info to eliminated ambiguity in identifying inbound connection fingerprints (clever idea, but had very little impact) - * fix: when sighup signal is received reloads torrc and internal state (caught by StrangeCharm) - * fix: probable resolution of nasty concurrent bug concerning access to connection cache - * fix: minor issues concerning connection panel including graph widths and miscalculating local maxima - * fix: short circuits fingerprint cache when looking up localhost descriptor (preventing lookup failures) - * fix: minor issues with connection panel and description popups when no connections are available - * fix: descriptor popup wasn't determining if the first visible line belonged to an encryption block - * fix: made interface more resilient against arbitrary resizing (such as during popups) - -8/17/09 - r20331 -Work done over this last week. - - * added: popup for raw consensus description - * added: total bandwidth measurement (feature request by StrangeCharm) - * added: connection entry for lookup of local consensus data - * change: widened graphs to utilize full screen width (clever idea by StrangeCharm) - * change: preserving runtime and pid when shutting down - * change: few tweaks to the readme - * fix: joining on worker daemon threads to exit gracefully (had a noisy race condition) - * fix: using BW events to keep connection count graph in sync with bandwidth graph - * fix: can now support graphs of multiple sizes - -8/8/09 - r20233 -Rewrote graph panel so it can handle any real time statistics. - - * added: option to graph connection counts (feature request by phobos) - * added: custom graph bounds (global or local maxima) - -8/4/09 -Announced the project on the or-talk mailing list today which spurred an interview with Brenno Winter (who works on the cleverly named Little Sister project). The interview is available here. - -8/3/09 - r20210 -Added start of a faq to the readme in preparation for announcement on or-talk. - -7/30/09 - r20198 -Work done over the trip. - - * added: customizable update interval for bandwidth graph (feature request by StrangeCharm) - * change: noted new project page in the readme (www.atagar.com/arm) - * change: added word wrapping to conf panel - * change: added function for custom popup menus - * change: logs error message when required event types are unsupported rather than throwing an exception - * change: using different screenshot images - * fix: resolved issue that caused monitor to think tor was resumed when quit - * fix: bug with panel utility's resize detection - * fix: resorts connections after NEWDESC and NEWCONSENSUS events - * fix: forgetting to to resume monitor at multiple points after a temporary pause - * fix: minor refactoring based on suggestions from pylint (unused imports and such) - -7/22/09 - r20115 -Another small grab bag update. - - * added: version status to header panel - * change: noted "Common *nix commands including: ps, pidof, host, and netstat" among requirements in readme - * change: took some tricks from Mike's ConsensusTracker to further improve match rate - * fix: type mismatch that greatly diminished fingerprint matching - * fix: accidentally used idhash rather than idhex for fingerprints when updating cache with the contents of a NEWDESC event - -7/21/09 - r20100 -Quick fixes based on discussion on irc. - - * change: provides warning when geoip database is unavailable (thanks to SwissTorExit and karsten) - * fix: missing import for the socket module - -7/20/09 - r20096, r20097, r20098 -Couple fixes so arm plays nicely in the case of multiple running tor instances. - - * fix: can now deal with multiple tor instances: checks pid of process with the open control port - * fix: if only one tor process is running use that pid (netstat fails if running as a different user - -7/19/09 - r20087, r20090 -Last substantial feature on my to-do list. - - * added: connections can be selected to view consensus details (very spiffy!) - * added: listing selection is by menu rather than cycling - * fix: couple bugs, the most interesting being when netstat can't resolve a connections listing (spotted by phobos) - -7/18/09 - r20078, r20079 -Miscellaneous fix and feature batch. - - * added: relay's flags to the header - * added: listing by relay nickname - * added: additional event aliases and option for NEWCONSENSUS - * added (phobos): screenshot of arm in action so people can see what it looks like - * change: use constant "Listing" label for sorting rather than current view - * change: removed 'reload torrc' option (deceptive and useless) - * fix: updates cached consensus mappings with NEWDESC and NEWCONSENSUS events - -7/14/09 - r20016 -Resolved a few quick bugs: - - * fix: added fingerprint lookup cache to resolve substantial performance issue - * fix: hostname resolution progress accounts for newly added entries (no more negative progress) - * fix: resolved bug that prevented arm from starting if too small - * fix: ordering issue when sorting unresolved ip addresses - -7/11/09 - r19975 -Connections panel can now list by IP, hostname, or fingerprint: reverse resolution was easy, but comparing three different implementations and making it non-blocking with a pausable thread-pool backend? Not so much. - -7/8/09 - r19953, r19957 -Just got back from Toorcamp. Preliminary connection page and miscellaneous additions. - - * added: basic connection listing page (using netstat results) - * added: connection listing now has user configurable sort functionality (it's actually pretty spiffy: supports secondary and tertiary sub-keys) - * added: 'addfstr' to util which allows for embedded formatting tags (VERY helpful) - * added: help shows page's current settings - * added: made bandwidth panel toggleable - * added: avg bandwidth to bottom of panel - * fix: prevented header from being paused on page change - * fix: prevented bandwidth accounting events from being lost when paused - -6/14/09 - r19716 -Decently big batch of feature additions and bug fixes. - - * added: second page that presents torrc with syntax highlighting, optional comment stripping, etc - * added: ps sampling (cpu/memory usage, pid, and uptime) - * added: help popup with page controls - * fix: corrected issue that caused periodic refreshing to fail - * fix: accounting reset time takes into account DST - * fix: make accounting input and header pausable - -6/10/09 - r19708, r19709 -Couple quick changes. - - * change: removed '--path-to-torctl' startup option - * fix: accounting 'time to reset' now includes gmt to local conversion - -6/7/09 - r19646, r19655, r19656 -Couple features. - - * added: svn external inclusion of TorCtl - * added: bandwidth panel now displays accounting data if set - -6/6/09 - r19636, r19637 -Quick change based on discussion on irc. - - * added: command line argument to specify location of TorCtl without changing Python path first (feature request by phobos) - -6/5/09 - r19629 -Substantial refactoring changes. - - * change: switched from a functional to an OO implementation which further simplified the controller: as an added plus this should make adding additional 'pages' trivial - * change: offloaded resizing to the curses wrapper - * fix: dealt with another curses wtf bug where panels wouldn't repaint unless done in a specific order - -6/4/09 - r19626 -Tested and corrected formatting for all event types except STREAM and STREAM_BW (not sure how to make those occur...). - -6/2/09 - r19615, r19619, r19620 -Introduced layer of abstraction from curses, simplifying its use and greatly improving reliability. - - * added: introduced wrapper to hide curses ugliness which greatly simplified interface code - * added: notice when relay's been silent for five seconds (based on BW events so probably due to Tor being closed), another idea by karsten - * changed: unchecked events have stubs to present information and provide debugging information in case of type mismatch - * fix: all problems with resizing: it's now rock solid - -5/29/09 - r19580, r19594 -Fixes for several rather sinister reliability problems: - - * added: allows logged events to be changed while running (suggested feature by karsten) and experimenting with a more modular design - * fix: added non-blocking reentrant locks to fix concurrency errors that caused chaotic terminal glitches (such as switching to a Chinese character set) - * fix: now fully handles resizing (including vertical) - * fix: using new capabilities in TorCtl including cookie authentication and disabling logging - * fix: bandwidth graph bug when paused - * fix: occasionally refreshes static content in case of graphical hiccups - * fix: added workaround for obscure curses caching bug that prevented portions of the screen from being redrawn - * fix: bug preventing initialization if too small - -5/25/09 - r19567 -Few small tweaks including: - - * added: tiny shell script to alias starting - * added: more informative error message if TorCtl isn't available - * change: defaultly logged events - * change: make inclusion of 'unknown' events toggleable - -5/24/09 - r19548, r19549, r19550, r19551 -Initial version of arm (terminal relay status monitor). Repository set up by arma. - - * fix: bug concerning undefined exit policy - * fix: resolved issue that prevented monitor from functioning in terminals without curs_set support - - Deleted: arm/release/LICENSE =================================================================== --- arm/release/LICENSE 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/release/LICENSE 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. Deleted: arm/release/README =================================================================== --- arm/release/README 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/release/README 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,183 +0,0 @@ -arm (anonymizing relay monitor) - Terminal status monitor for Tor relays. -Developed by Damian Johnson (www.atagar.com - atagar1(a)gmail.com) -All code under the GPL v3 (http://www.gnu.org/licenses/gpl.html) -Project page: www.atagar.com/arm - -Description: -Command line application for monitoring Tor relays, providing real time status -information such as the current configuration, bandwidth usage, message log, -connections, etc. This uses a curses interface much like 'top' does for system -usage. The application is intended for command-line aficionados, ssh -connections, and anyone stuck with a tty terminal for checking their relay's -status. Releases should be stable so if you manage to make it crash (or have a -feature request) then please let me know! - -The project was originally proposed in 2008 by Jacob and Karsten: - http://archives.seul.org/or/dev/Jan-2008/msg00005.html - -An interview by Brenno Winter discussing the project is available at: - http://www.atagar.com/arm/HFM_INT_0001.mp3 - -Requirements: -Python 2.5 -TorCtl (this is included with arm) -Tor is running with an available control port. This means either... - ... starting Tor with '--controlport <PORT>' - ... or including 'ControlPort <PORT>' in your torrc - -It's also highly suggested for the control port to require authentication. -This can be done either with a cookie or password: - * Cookie Authentication - Controllers authenticate to Tor by providing the - contents of the control_auth_cookie file. To set this up... - - add "CookieAuthentication 1" to your torrc - - either restart Tor or run "pkill -sighup tor" - - this method of authentication is automatically handled by arm, so you - can still start arm as you normally would - - * Password Authentication - Attaching to the control port requires a - password. To set this up... - - run "tor --hash-password <your password>" - - add "HashedControlPassword <hashed password>" to your torrc - - either restart Tor or run "pkill -sighup tor" - - when starting up arm will prompt you for this password - -For full functionality this also needs: -- To be ran with the same user as tor to avoid permission issues with - connection resolution and reading the torrc. - -- Common *nix commands including: - * ps - * a method of connection resolution (any of the following): - * sockstat - * netstat - * ss - * lsof - * procstat - * tail - * pwdx - * ulimit - * pgrep or pidof - * host (if dns lookups are enabled) - -This is started via 'arm' (use the '--help' argument for usage). - -------------------------------------------------------------------------------- - -FAQ: -> Why is it called 'arm'? - -Simple - because it makes the command short and memorable. Terminal -applications need to be easy to type (like 'top', 'ssh', etc), and anything -longer is just begging command-line aficionados to alias it down. I chose the -meaning of the acronym ('anonymizing relay monitor') afterward. - -> If you're listing connections then what about exit nodes? Won't this include -people's traffic? - -No. Potential client and exit connections are specifically scrubbed of -identifying information. Be aware that it's highly discouraged for relay -operators to fetch this data, so please don't. - -> Is it harmful to share the information provided by arm? - -Not really, but it's discouraged. The original plan for arm included a special -emphasis that it wouldn't log any data. The reason is that if a large number of -relay operators published the details of their connections then correlation -attacks could break Tor user's anonymity. Just show some moderation in what you -share and it should be fine. - -> Is there any chance that arm will leak data? - -Not by default, arm is a passive listener with one exception. The second page -(connections) provides the hostnames of Tor relays you're connected to. This -means reverse DNS lookups which, if monitored, could leak your current -connections to an eavesdropper. However, this is disabled by default and -lookups are only made upon request (when showing connection details or listing -connections by hostname). See the page's help for how to enable lookups. - -That said, this is not a terribly big whoop. ISPs and anyone sniffing your -connection already have this data - the only difference is that instead of -saying "I am talking to x" you're saying "I'm talking to x, who's x?", meaning -the resolver's also aware of who they are. - -> When arm starts it gives "Unable to resolve tor pid, abandoning connection -listing"... why? - -If you're running multiple instances of tor then arm needs to figure out which -pid belongs to the open control port. If it's running as a different user (such -as being in a chroot jail) then it's probably failing due to permission issues. -Arm still runs, just no connection listing or ps stats. - -> The bandwidth graph showing up - -Some terminals, most notably screen sessions on Gentoo, appear to have a bug -where highlighted spaces aren't rendered. A reported workaround is to set: - TERM="rxvt-unicode" - -------------------------------------------------------------------------------- - -Layout: - -./ - arm - startup script - install - installation script - - arm.1 - man page - armrc.sample - example arm configuration file with defaults - ChangeLog - revision history - LICENSE - copy of the gpl v3 - README - um... guess you figured this one out - setup.py - distutils installation script for arm - - src/ - __init__.py - starter.py - parses and validates commandline parameters - prereq.py - checks python version and for required packages - version.py - version and last modified information - test.py - method for starting tests and demos - settings.cfg - attributes loaded for parsing tor related data - torConfigDesc.txt - fallback descriptions of Tor's configuration options - uninstall - removal script - - interface/ - connections/ - __init__.py - connPanel.py - (page 2) lists the active tor connections - circEntry.py - circuit entries in the connection panel - connEntry.py - individual connections to or from the system - entries.py - common parent for connPanel display entries - - graphing/ - __init__.py - graphPanel.py - (page 1) presents graphs for data instances - bandwidthStats.py - tracks tor bandwidth usage - psStats.py - tracks system information (such as cpu/memory usage) - connStats.py - tracks number of tor connections - - __init__.py - controller.py - main display loop, handling input and layout - headerPanel.py - top of all pages, providing general information - - logPanel.py - (page 1) displays tor, arm, and torctl events - fileDescriptorPopup.py - (popup) displays file descriptors used by tor - - connPanel.py - (page 2) deprecated counterpart for connections/* - descriptorPopup.py - (popup) displays connection descriptor data - - configPanel.py - (page 3) editor panel for the tor configuration - torrcPanel.py - (page 4) displays torrc and validation - - util/ - __init__.py - conf.py - loading and persistence for user configuration - connections.py - service providing periodic connection lookups - enum.py - enumerations for ordered collections - hostnames.py - service providing nonblocking reverse dns lookups - log.py - aggregator for application events - panel.py - wrapper for safely working with curses subwindows - procTools.py - queries process & system information from /proc contents - sysTools.py - helper for system calls, providing client side caching - torConfig.py - functions for working with the torrc and config options - torTools.py - TorCtl wrapper, providing caching and derived information - uiTools.py - helper functions for presenting the user interface - Added: arm/release/README =================================================================== --- arm/release/README (rev 0) +++ arm/release/README 2011-04-20 15:46:23 UTC (rev 24662) @@ -0,0 +1,6 @@ +Did you come here looking for arm's source code repository? Arm has been +migrated to Git and is now available at: +git://git.torproject.org/arm.git + +For web-based access, use https://gitweb.torproject.org/arm.git + Deleted: arm/release/arm =================================================================== --- arm/release/arm 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/release/arm 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,13 +0,0 @@ -#!/bin/sh -if [ "$0" = /usr/bin/arm ]; then - arm_base=/usr/share/arm/ -else - arm_base=$( dirname "$0" )/src/ -fi - -python "${arm_base}prereq.py" - -if [ $? = 0 ]; then - exec python -W ignore::DeprecationWarning "${arm_base}starter.py" $* -fi - Deleted: arm/release/arm.1 =================================================================== --- arm/release/arm.1 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/release/arm.1 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,74 +0,0 @@ -.TH arm 1 "27 August 2010" -.SH NAME -arm - Terminal Tor status monitor - -.SH SYNOPSIS -arm [\fIOPTION\fR] - -.SH DESCRIPTION -The anonymizing relay monitor (arm) is a terminal status monitor for Tor -relays, intended for command-line aficionados, ssh connections, and anyone -stuck with a tty terminal. This works much like top does for system usage, -providing real time statistics for: - * bandwidth, cpu, and memory usage - * relay's current configuration - * logged events - * connection details (ip, hostname, fingerprint, and consensus data) - * etc - -Defaults and interface properties are configurable via a user provided -configuration file (for an example see the provided \fBarmrc.sample\fR). -Releases and information are available at \fIhttp://www.atagar.com/arm\fR. - -.SH OPTIONS -.TP -\fB\-i\fR, \fB\-\-interface [ADDRESS:]PORT\fR -tor control port arm should attach to (default is \fB127.0.0.1:9051\fR) - -.TP -\fB\-c\fR, \fB\-\-config CONFIG_PATH\fR -user provided configuration file (default is \fB~/.armrc\fR) - -.TP -\fB\-d\fR, \fB\-\-debug\fR -writes all arm logs to /home/atagar/.arm/log - -.TP -\fB\-b\fR, \fB\-\-blind\fR -disable connection lookups (netstat, lsof, and ss), dropping the parts of the -interface that rely on this information - -.TP -\fB\-e\fR, \fB\-\-event EVENT_FLAGS\fR -flags for tor, arm, and torctl events to be logged (default is \fBN3\fR) - - d DEBUG a ADDRMAP k DESCCHANGED s STREAM - i INFO f AUTHDIR_NEWDESCS g GUARD r STREAM_BW - n NOTICE h BUILDTIMEOUT_SET l NEWCONSENSUS t STATUS_CLIENT - w WARN b BW m NEWDESC u STATUS_GENERAL - e ERR c CIRC p NS v STATUS_SERVER - j CLIENTS_SEEN q ORCONN - DINWE tor runlevel+ A All Events - 12345 arm runlevel+ X No Events - 67890 torctl runlevel+ U Unknown Events - -.TP -\fB\-v\fR, \fB\-\-verion\fR -provides version information - -.TP -\fB\-h\fR, \fB\-\-help\fR -provides usage information - -.SH FILES -.TP -\fB~/.armrc\fR -Your personal arm configuration file - -.TP -\fB/usr/share/doc/arm/armrc.sample\fR -Sample armrc configuration file that documents all options - -.SH AUTHOR -Written by Damian Johnson (atagar1(a)gmail.com) - Deleted: arm/release/armrc.sample =================================================================== --- arm/release/armrc.sample 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/release/armrc.sample 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,279 +0,0 @@ -# Startup options -startup.controlPassword -startup.interface.ipAddress 127.0.0.1 -startup.interface.port 9051 -startup.blindModeEnabled false -startup.events N3 -startup.dataDirectory ~/.arm - -# Seconds between querying information -queries.resourceUsage.rate 5 -queries.connections.minRate 5 -queries.refreshRate.rate 5 - -# Read the proc contents directly instead of calling ps, netstat, and other -# resolvers. This provides very sizable performance benefits (around 90% -# faster lookups) but this is only available on Linux. -queries.useProc true - -# Renders the interface with color if set and the terminal supports it -features.colorInterface true - -# Checks the torrc for issues, warning and hilighting problems if true -features.torrc.validate true - -# Set this if you're running in a chroot jail or other environment where tor's -# resources (log, state, etc) should have a prefix in their paths. -features.pathPrefix - -# If set, arm appends any log messages it reports while running to the given -# log file. This does not take filters into account or include prepopulated -# events. -features.logFile - -# Paremters for the log panel -# --------------------------- -# showDateDividers -# show borders with dates for entries from previous days -# showDuplicateEntries -# shows all log entries if true, otherwise collapses similar entries with an -# indicator for how much is being hidden -# entryDuration -# number of days log entries are kept before being dropped (if zero then -# they're kept until cropped due to caching limits) -# maxLinesPerEntry -# max number of lines to display for a single log entry -# prepopulate -# attempts to read past events from the log file if true -# prepopulateReadLimit -# maximum entries read from the log file, used to prevent huge log files from -# causing a slow startup time. -# maxRefreshRate -# rate limiting (in milliseconds) for drawing the log if updates are made -# rapidly (for instance, when at the DEBUG runlevel) - -features.log.showDateDividers true -features.log.showDuplicateEntries false -features.log.entryDuration 7 -features.log.maxLinesPerEntry 4 -features.log.prepopulate true -features.log.prepopulateReadLimit 5000 -features.log.maxRefreshRate 300 - -# Paremters for the config panel -# --------------------------- -# order -# three comma separated configuration attributes, options including: -# 0 -> Category, 1 -> Option Name, 2 -> Value, 3 -> Arg Type, -# 4 -> Arg Usage, 5 -> Summary, 6 -> Description, 7 -> Man Entry, -# 8 -> Is Default -# selectionDetails.height -# rows of data for the panel showing details on the current selection, this -# is disabled entirely if zero -# features.config.prepopulateEditValues -# when editing config values the current value is prepopulated if true, and -# left blank otherwise -# state.colWidth.* -# column content width -# state.showPrivateOptions -# tor provides config options of the form "__<option>" that can be dangerous -# to set, if true arm provides these on the config panel -# state.showVirtualOptions -# virtual options are placeholders for other option groups, never having -# values or being setable themselves -# file.showScrollbars -# displays scrollbars when the torrc content is longer than the display -# file.maxLinesPerEntry -# max number of lines to display for a single entry in the torrc - -features.config.order 7, 1, 8 -features.config.selectionDetails.height 6 -features.config.prepopulateEditValues true -features.config.state.colWidth.option 25 -features.config.state.colWidth.value 15 -features.config.state.showPrivateOptions false -features.config.state.showVirtualOptions false -features.config.file.showScrollbars true -features.config.file.maxLinesPerEntry 8 - -# Descriptions for tor's configuration options can be loaded from its man page -# to give usage information on the settings page. They can also be persisted to -# a file to speed future lookups. -# --------------------------- -# enabled -# allows the descriptions to be fetched from the man page if true -# persist -# caches the descriptions (substantially saving on future startup times) - -features.config.descriptions.enabled true -features.config.descriptions.persist true - -# General graph parameters -# ------------------------ -# height -# height of graphed stats -# maxWidth -# maximum number of graphed entries -# interval -# 0 -> each second, 1 -> 5 seconds, 2 -> 30 seconds, 3 -> minutely, -# 4 -> 15 minutes, 5 -> half hour, 6 -> hourly, 7 -> daily -# bound -# 0 -> global maxima, 1 -> local maxima, 2 -> tight -# type -# 0 -> None, 1 -> Bandwidth, 2 -> Connections, 3 -> System Resources -# showIntermediateBounds -# shows y-axis increments between the top/bottom bounds - -features.graph.height 7 -features.graph.maxWidth 150 -features.graph.interval 0 -features.graph.bound 1 -features.graph.type 1 -features.graph.showIntermediateBounds true - -# Parameters for graphing bandwidth stats -# --------------------------------------- -# prepopulate -# attempts to use tor's state file to prepopulate the bandwidth graph at the -# 15-minute interval (this requires the minimum of a day's worth of uptime) -# prepopulateTotal -# populates the total stat from the state file if true (this only contains -# the last day's worth of information, so this metric isn't the true total) -# transferInBystes -# shows rate measurments in bytes if true, bits otherwise -# accounting.show -# provides accounting stats if AccountingMax was set -# accounting.rate -# seconds between querying accounting stats -# accounting.isTimeLong -# provides verbose measurements of time if true - -features.graph.bw.prepopulate true -features.graph.bw.prepopulateTotal false -features.graph.bw.transferInBytes false -features.graph.bw.accounting.show true -features.graph.bw.accounting.rate 10 -features.graph.bw.accounting.isTimeLong false - -# Parameters for connection display -# --------------------------------- -# oldPanel -# includes the old connection panel in the interface -# newPanel -# includes the new connection panel in the interface -# listingType -# the primary category of information shown by default, options including: -# 0 -> IP Address / Port 1 -> Hostname -# 2 -> Fingerprint 3 -> Nickname -# order -# three comma separated configuration attributes, options including: -# 0 -> Category, 1 -> Uptime, 2 -> Listing, 3 -> IP Address, -# 4 -> Port, 5 -> Hostname, 6 -> Fingerprint, 7 -> Nickname, -# 8 -> Country -# refreshRate -# rate at which the connection panel contents is redrawn (if higher than the -# connection resolution rate then reducing this won't casue new data to -# appear more frequently - just increase the rate at which the uptime field -# is updated) -# resolveApps -# issues lsof queries to determining the applications involved in local -# SOCKS and CONTROL connections -# markInitialConnections -# if true, the uptime of the initial connections when we start are marked -# with a '+' (these uptimes are estimates since arm can only track a -# connection's duration while it runs) -# showExitPort -# shows port related information of exit connections we relay if true -# showColumn.* -# toggles the visability of the connection table columns - -features.connection.oldPanel false -features.connection.newPanel true -features.connection.listingType 0 -features.connection.order 0, 2, 1 -features.connection.refreshRate 5 -features.connection.resolveApps true -features.connection.markInitialConnections true -features.connection.showExitPort true -features.connection.showColumn.fingerprint true -features.connection.showColumn.nickname true -features.connection.showColumn.destination true -features.connection.showColumn.expandedIp true - -# Thread pool size for hostname resolutions -# Determines the maximum number of concurrent requests. Upping this to around -# thirty or so seems to be problematic, causing intermittently seizing. - -queries.hostnames.poolSize 5 - -# Method of resolving hostnames -# If true, uses python's internal "socket.gethostbyaddr" to resolve addresses -# rather than the host command. This is ignored if the system's unable to make -# parallel requests. Resolving this way seems to be much slower than host calls -# in practice. - -queries.hostnames.useSocketModule false - -# Caching parameters -cache.sysCalls.size 600 -cache.hostnames.size 700000 -cache.hostnames.trimSize 200000 -cache.logPanel.size 1000 -cache.armLog.size 1000 -cache.armLog.trimSize 200 - -# Runlevels at which arm logs its events -log.startTime INFO -log.refreshRate DEBUG -log.highCpuUsage WARN -log.configEntryNotFound NONE -log.configEntryUndefined NOTICE -log.configEntryTypeError NOTICE -log.torCtlPortClosed NOTICE -log.torGetInfo DEBUG -log.torGetInfoCache NONE -log.torGetConf DEBUG -log.torGetConfCache NONE -log.torSetConf INFO -log.torEventTypeUnrecognized NOTICE -log.torPrefixPathInvalid NOTICE -log.procCallMade DEBUG -log.sysCallMade DEBUG -log.sysCallCached NONE -log.sysCallFailed INFO -log.sysCallCacheGrowing INFO -log.panelRecreated DEBUG -log.graph.bw.prepopulateSuccess NOTICE -log.graph.bw.prepopulateFailure NOTICE -log.logPanel.prepopulateSuccess INFO -log.logPanel.prepopulateFailed WARN -log.logPanel.logFileOpened NOTICE -log.logPanel.logFileWriteFailed ERR -log.logPanel.forceDoubleRedraw DEBUG -log.torrc.readFailed WARN -log.torrc.validation.torStateDiffers WARN -log.torrc.validation.unnecessaryTorrcEntries NOTICE -log.configDescriptions.readManPageSuccess INFO -log.configDescriptions.readManPageFailed NOTICE -log.configDescriptions.unrecognizedCategory NOTICE -log.configDescriptions.internalLoadSuccess NOTICE -log.configDescriptions.internalLoadFailed ERR -log.configDescriptions.persistance.loadSuccess INFO -log.configDescriptions.persistance.loadFailed INFO -log.configDescriptions.persistance.saveSuccess NOTICE -log.configDescriptions.persistance.saveFailed NOTICE -log.connResolverOptions INFO -log.connLookupFailed INFO -log.connLookupFailover NOTICE -log.connLookupAbandon WARN -log.connLookupRateGrowing NONE -log.hostnameCacheTrimmed INFO -log.cursesColorSupport INFO -log.bsdJailFound INFO -log.unknownBsdJailId WARN -log.geoipUnavailable WARN -log.stats.failedProcResolution DEBUG -log.stats.procResolutionFailover INFO -log.stats.failedPsResolution INFO -log.savingDebugLog NOTICE - Deleted: arm/release/install =================================================================== --- arm/release/install 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/release/install 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,15 +0,0 @@ -#!/bin/sh -python src/prereq.py - -if [ $? = 0 ]; then - python setup.py -q install - - # provide notice if we installed successfully - if [ $? = 0 ]; then - echo "installed to /usr/share/arm" - fi - - # cleans up the automatically built temporary files - rm -rf ./build -fi - Deleted: arm/release/setup.py =================================================================== --- arm/release/setup.py 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/release/setup.py 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,103 +0,0 @@ -#!/usr/bin/env python -import os -import sys -import gzip -import tempfile -from src.version import VERSION -from distutils.core import setup - -# Use 'tor-arm' instead of 'arm' in the path for the sample armrc if we're -# building for debian. - -isDebInstall = False -for arg in sys.argv: - if "tor-arm" in arg: - isDebInstall = True - break - -docPath = "/usr/share/doc/%s" % ("tor-arm" if isDebInstall else "arm") - -# Allow the docPath to be overridden via a '--docPath' argument. This is to -# support custom documentation locations on Gentoo, as discussed in: -# https://bugs.gentoo.org/349792 - -try: - docPathFlagIndex = sys.argv.index("--docPath") - if docPathFlagIndex < len(sys.argv) - 1: - docPath = sys.argv[docPathFlagIndex + 1] - - # remove the custom --docPath argument (otherwise the setup call will - # complain about them) - del sys.argv[docPathFlagIndex:docPathFlagIndex + 3] - else: - print "No path provided for --docPath" - sys.exit(1) -except ValueError: pass # --docPath flag not found - -# Provides the configuration option to install to "/usr/share" rather than as a -# python module. Alternatives are to either provide this as an input argument -# (not an option for deb/rpm builds) or add a setup.cfg with: -# [install] -# install-purelib=/usr/share -# which would mean a bit more unnecessary clutter. - -manFilename = "arm.1" -if "install" in sys.argv: - sys.argv += ["--install-purelib", "/usr/share"] - - # Compresses the man page. This is a temporary file that we'll install. If - # something goes wrong then we'll print the issue and use the uncompressed man - # page instead. - - try: - manInputFile = open('arm.1', 'r') - manContents = manInputFile.read() - manInputFile.close() - - # temporary destination for the man page guarenteed to be unoccupied (to - # avoid conflicting with files that are already there) - tmpFilename = tempfile.mktemp("/arm.1.gz") - - # make dir if the path doesn't already exist - baseDir = os.path.dirname(tmpFilename) - if not os.path.exists(baseDir): os.makedirs(baseDir) - - manOutputFile = gzip.open(tmpFilename, 'wb') - manOutputFile.write(manContents) - manOutputFile.close() - - # places in tmp rather than a relative path to avoid having this copy appear - # in the deb and rpm builds - manFilename = tmpFilename - except IOError, exc: - print "Unable to compress man page: %s" % exc - -setup(name='arm', - version=VERSION, - description='Terminal tor status monitor', - license='GPL v3', - author='Damian Johnson', - author_email='atagar(a)torproject.org', - url='http://www.atagar.com/arm/', - packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util', 'arm.TorCtl'], - package_dir={'arm': 'src'}, - data_files=[("/usr/bin", ["arm"]), - ("/usr/share/man/man1", [manFilename]), - (docPath, ["armrc.sample"]), - ("/usr/share/arm", ["src/settings.cfg"])], - ) - -# Cleans up the temporary compressed man page. -if manFilename != 'arm.1' and os.path.isfile(manFilename): - if "-q" not in sys.argv: print "Removing %s" % manFilename - os.remove(manFilename) - -# Removes the egg_info file. Apparently it is not optional during setup -# (hardcoded in distutils/command/install.py), nor are there any arguments to -# bypass its creation. The deb build removes this as part of its rules script. -eggPath = '/usr/share/arm-%s.egg-info' % VERSION - -if not isDebInstall and os.path.isfile(eggPath): - if "-q" not in sys.argv: print "Removing %s" % eggPath - os.remove(eggPath) - Deleted: arm/trunk/ChangeLog =================================================================== --- arm/trunk/ChangeLog 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/trunk/ChangeLog 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,582 +0,0 @@ -CHANGE LOG - -4/4/11 - version 1.4.2 (r24555) -This release chiefly consists of a fully reimplemented connection panel. Besides being a sane, maintainable implementation this includes numerous new features and improvements like full circuit paths, applications involved for local connections, and better type identification. - - * added: full rewrite of the connection panel, providing: - o listing the full paths involved in active circuits - o identification of socks, hidden service, and controller applications (arm, vidalia, polipo, etc) - o identification of exit connections with the common usage for the port they're using - o display of the local -> internal -> external address when room is available (original patch by Fabian Keil) - o better accuracy and performance in identifying client and directory connections - o marking the uptimes for initial connections (arm only tracks connection uptimes since starting, so these entries are just minimum durations) - o lazily loading the initial IP -> fingerprint mappings to improve the startup time - o using the circuit-status to disambiguating multiple relays on the same IP address - o smarter space utilization, filling in smaller columns if there isn't room for higher priority but larger entries - o connection details popup changes: - + using the consensus exit policies rather than the longer descriptor versions when available - + displaying connection details no longer freezes the rest of the display - + detail panel uses the full screen width and is dynamically resizable - + more resilient to missing descriptors - * change: hiding most tor config values by default (idea by arma) - * change: dropping warning suggesting that users set the FetchUselessDescriptors option (suggestion by Sebastian and others) - * change: always starting the bandwidth field from zero rather than using the state file total, which only contains the last day's worth of data (thanks to guilhem) - * change: suggesting authentication and giving steps for it in the readme (suggestion by Sebastian) - * change: caching config display lines, which reduces the CPU usage when scrolling by around 40% - * change: added summaries for the remaining tor configuration options - * change: using a dedicated enum class rather than tuple sets - * fix: torrc validation requires 'GETINFO config-text' which was introduced in Tor verison 0.2.2.7 (caught by Sjon, talion, and torland, https://trac.torproject.org/projects/tor/ticket/2501) - * fix: off-by-one issue with the displayed line numbers for torrc errors (caught by Sjon) - * fix: bin function wasn't available before python 2.6 (caught by Paul Menzel) - * fix: mis-parsing family entries when there's no entry after the comma (caught by StrangeCharm, https://trac.torproject.org/projects/tor/ticket/2414) - * fix: preventing SOCKS and CONTROL connections from being expanded (patch by Fabian Keil) - * fix: disabling name resolution for application queries to avoid leaking to resolvers (patch by Fabian Keil) - * fix: reversing src and dst addresses of SOCKS and CONTROL connections (caught by Fabian Keil) - * fix: changing the 'APPLICATION' type to 'SOCKS' since the previous label was too long (caught by Fabian Keil) - * fix: crashing issue from unknown relay nicknames (caught by krkhan) - * fix: concurrency bug occasionally causing "syshook" stacktraces when shutting down - * fix: header panel displayed the wrong IP address if it changed since we first started (https://trac.torproject.org/projects/tor/ticket/2776) - * fix: unchecked OSError could cause us to crash when making directories (for instance if there was a permissions issue) - * fix: the availability check for bsd resolvers was broken, probably causing resolution to fail for a few seconds on that platform - * fix: dropping the pointless 'Log notice stdout' entry provided by config-text queries (https://trac.torproject.org/projects/tor/ticket/2362) - * fix: taking DirServer and AlternateDirAuthority into account when determining the directory authorities - * fix: consuming a little extra space in the connection panel when scrollbars aren't visible - * fix: dropping the deprecated 'features.config.descriptions.persistPath' config option - * fix: failed connection attempts to the control port were generating zombie connections (https://trac.torproject.org/projects/tor/ticket/2812) - * fix: concurrency bug in joining on the TorCtl thread when tor shut down - * fix: the 'startup.dataDirectory' config option was being ignored - * fix: recognizing the proper private ip ranges of the 172.* block - * fix: missing 'is default' option from config sort ordering - * fix (4/4/11, r24562): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) - * fix (4/6/11, r24570): missing new connection components from installations (caught by Anthony Basile) - * fix (4/13/11, r24613): failed requests for our flags cause a syntax error (caught by qbi) - -1/7/11 - version 1.4.1 (r24054) -Platform specific enhancements including BSD compatibility and vastly improved performance on Linux. - - * added: querying the proc contents when able for tor resource and connection samplings to *greatly* reduce arm's resource usage (many thanks to psutil) - * added: vastly improved BSD compatibility, thanks to patches by Fabian Keil - o pid resolution via pgrep (all platforms) and sockstat (bsd only) - o connection resolution via sockstat (all platforms) and procstat (bsd only) - o autodetecting the path prefix for FreeBSD jails - * added: displaying summaries of the options on the configuration panel (idea by Sebastian) - * added: arm cpu usage to the header panel and logs (with an estimate for system call usages) - * added: testing script for checking connection resolution performance, connection dumps, and the glyph demo - * added: option to dump arm debug logs (better failsafe option) - * change: incrementing the uptime field of the header panel each second - * change: centralizing arm resources in ~/.arm (suggested by Sebastian and also thanks to feedback from rransom) - * change: using exponential backoff of ps/proc resource resolutions when calls fail or tor isn't running - * change: reordered resolvers by order of performance - * change: when tor's man page is unavailable falling back to descriptions provided with arm (often the case with tbb) - * change: dropping support for graphing of custom ps attributes (feature was never used, kinda pointless, and incompatible with the proc enhancement) - * fix: providing proper cpu samplings rather than an average over the life of the process - * fix: expanding relative paths for the authentication cookie (mostly a problem for tbb instances) - * fix: crashing error when querying hidden service parameters (caught by StrangeCharm, fixed by katmagic and chiiph) - * fix: initially built diff differed from rebuilt version since it was missing the pycompat (caught by weasel) - * fix: startup script wasn't handling unusual paths, such as with spaces and dashes (caught by weasel) - * fix: startup script was forking the final process instead of calling exec (caught by weasel) - * fix: log entries weren't being bracketed by date dividers when no scroll bars were visible (caught thanks to twur) - * fix: workaround for config-text providing Log entries regardless of if it matches the default (caught thanks to Trystero) - * fix: config validation mistakenly thought that Tor stripped spaces from CSV getconf responses (caught by murble) - * fix: presenting a text input field with python 2.5 would crash (caught by murble) - * fix: reloading torrc contents when a sighup is issued (caught by StrangeCharm) - * fix: modifying lsof resolution to work with additional platforms (patch by Fabian Keil) - * fix: dropping the locale for internal connections (patch by Fabian Keil) - * fix: labeling connections to our socks port as being client connections (caught by Fabian Keil) - * fix: skipping internal -> external address translation when the external address is private (caught by Fabian Keil) - * fix: suppressing superfluous lsof warnings (patch by Hans Schnehl) - * fix: when the pid was unavailable some resolvers failed to work - * fix: including udp connection results (needed since exits proxy dns traffic) - * fix: crashing issue when nickname was undefined but displayed on the connection panel - * fix: concurrency issue caused the first connection resolution to often not have the pid - * fix: connection resolution wasn't finding results if tor was running under a different name - * fix: brought all Linux connection resolvers into parity (established tcp connections only) - * fix: commands with quoted pipes were being mis-parsed by the sysTools' call function - * fix (1/11/11, r24064): including platform, python version, and arm/tor configurations in debug dumps - * fix (1/11/11, r24064): properly parse the ps field when displaying decimal seconds (patch by Fabian) - * fix (1/11/11, r24064): error when initial resource lookups fail (caught by Trystero) - * fix (1/12/11, r24075): decimal seconds in the ps uptime field were being misparsed (patch by Fabian) - * fix (1/15/11, r24092): adding a --docPath argument to help Gentoo ebuilds (https://bugs.gentoo.org/349792) - -11/27/10 - version 1.4.0 (r23873) -Introducing a new page for managing tor's configuration, along with several other improvements. - - * added: editor for the tor configuration, providing: - o a simple method for setting config values and saving the new torrc - o descriptions and usage information for the tor configuration options, fetched from its man page - o color and bolding to indication option categories and if they're default or custom values - o sorting by any of the config attributes - * change: numerous revisions in preparation for being included in debian, thanks to weasel - o moved deb/rpm build resources out of the source repository and added helper scripts - o moved the arm install location to /usr/share/arm - o purging the autogenerated egg file from the deb build - o using temporary file utility for man page compression to avoid potential security issues (thanks to asn) - o including dh_pysupport flag so it'll recognize the private python module (thanks to Emilio Pozuelo Monfort) - o small revisions to several bits of debian metadata - * change: full rewrite of the log panel, providing: - o added: scrollbar and scrolling by displayed content rather than line numbers - o added: checking for torrc entries that are pointless due to matching the default value - o added: validation warning when custom entries are missing from the torrc - o added: handling for the multiline torrc entry support that was added in tor 0.2.2.17-alpha - o change: simplified and expanded on the config display and validation (performance improvements, human friendly units for torrc corrections, etc) - o fix: torrc validation didn't recognize 'second' and 'byte' arguments - o fix: scrolling was buggy if comments were being stripped - o fix: more helpful messages for validation errors - o fix: unnecessary whitespace was being stripped - * added: INFO level logging for the arm startup time - * change: removing all references to the controller password after we've connected to tor (request by ioerror) - * change: using curses.textpad to improve text fields (supports arrow keys, emacs keybindings, etc) - * change: revised the arm config interface (simplified and expanded to include maps) - * fix: verbose logging was causing the application to freeze due to an n^2 deduplication implementation, disabling this feature for now when it takes too long (caught by NightMonkey) - * fix: wasn't loading the settings.cfg if starting starter from the src directory (caught by NightMonkey) - * fix: displaying empty conf contents caused crashes when calling math.log10(0) (caught by NightMonkey) - * fix: persisting results from scraping the man page to greatly reduce startup time (idea by nickm) - * fix: path for the sample armrc was wrong in the man page (caught by weasel) - * fix: the arm starter was only executable from the arm directory - * fix: not all worker threads were daemons, causing the process to persist in a broken state after exceptions and when quitting via ctrl+c - * fix: custom armrcs resulted in the parsing config options being unavailable - * fix: rounding error in rendering the scrollbar, causing it to shrink a line when at the bottom - * fix: crashing issue when the 'queries.ps.rate' config value was undefined and the stats graph was displayed - * fix: making the interface more resilient to being resized while popups are visible - * fix: log panel wasn't respecting the prepopulate* log level config options - * fix: off by one error when wrapping lines in the log panel - * fix (11/30/10, r23882): install script was failing to make the temporary directory for the compressed man page - * fix (11/30/10, r23882): a torrc validation log entries had a typo - -10/6/10 - version 1.3.7 (r23439) -Numerous improvements, most notably being an expanded log panel, installer, and deb/rpm builds. - - * added: installation/removal scripts and man page (thanks to kaner) - * added: scripts and resources for making deb and rpm releases (thanks to ioerror, and also requested by helmut) - * added: path prefix option for chroot jails (requested by asn) - * added: customizable graph size (requested by voidzero) - * added: incremental y-axis measurements to the graph (requested by voidzero) - * added: caching for static GETINFO parameter - * added: logging for the refresh rate metric - * change: full rewrite of the log panel, providing: - o dividers for the date, bordering all events that occurred on the same day - o hiding duplicate log entries (feature request by asn) - o coalescing updates if they're numerous, such as running at the DEBUG runlevel - o providing a notice if tor supports event types that arm doesn't, and logging them as the 'UNKNOWN' type - o condensing the label for runlevel event ranges further if they're identical for multiple types - o options for: - + saving logged events to a file, either via snapshots or running persistence - + presenting torctl events of arbitrary runlevels - + clearing the event log - + maximum lines displayed from individual log entries - + cropping based on time (requested by voidzero) - o numerous performance improvements (for log prepopulation, determining the content length, caching for helper functions, etc) - o minor bug fixes including: - + added handling for BUILDTIMEOUT_SET events - + dropping brackets from label if no events are being logged - + merging tor and arm backlogs according to timestamps - + regex matches were failing for multiline log entries - * change: using PidFile entry to fetch pid if available (idea by arma) - * change: dropping irrelevant information from the header when not running as a relay - * change: updated torctl version to the current git head release - * change: measuring by bits for transfer rates (config can set it back to bytes) - * change: home/end keys jump to start/end of all scroll areas (request by dun) - * change: trimmed last couple letters off downloaded/uploaded labels (requested by asn) - * change: dropping the 'frequentRefresh' parameter in favor of just doing refreshes when there's new graph stats available - * fix: shifting bandwidth prepopulation by a sampling interval to account for tor's internal behavior (thanks to voidzero, nickm, arma, and Sebastian) - * fix: making rdns resolution disabled by defaut due to possible connection disclosure to upstream resolver (thanks to Sebastian) - * fix: skipping bandwidth prepopulation if not running as a relay (caught by arma) - * fix: bandwidth stats above the graph weren't getting reset by sighups (caught by voidzero) - * fix: config and connection panels were failing to parse a torrc with tabs (caught by voidzero) - * fix: remapping torrc aliases so GETCONF calls don't fail (caught by voidzero) - * fix: crashing error in bandwidth panel for wide screen displays (caught by cjb) - * fix: changing debian arch to all rather than any (suggestion by murb) - * fix: had case sensitive check for the torrc logging types (caught by asn) - * fix: crashing error when ExitPolicy was undefined (caught by asn) - * fix: dumping a stacktrace to /tmp and exiting immediately if exceptions are raised while redrawing - * fix: connection panel failed to handle family entries identified by its nickname - * fix: race condition between heartbeat detection and getting the first BW event - * fix: refreshing after popups to make the interface seem more responsive - * fix: crashing and minor display issues if orport was left unset - * fix (10/7/10, r23463): crashing from type issue in the graph panel (caught by tomb) - -6/7/10 - version 1.3.6 (r22617) -Rewrite of the first third of the interface, providing vastly improved performance, maintainability, and a few very nice features. This improved the refresh rate (which is also related to system resource usage) from 30ms to 4ms (an 87% improvement). - - * added: settings are fetched from an optional armrc (update rates, controller password, caching, runlevels, etc) - * added: system tools util providing simplified usage, suppression of leaks to stdout, logging, and optional caching - * added: wrapper for accessing TorCtl providing: - o client side caching for commonly fetched relay information (fingerprint, descriptor, etc) - o singleton accessor and convenience functions, simplifying interface code - o wrapper allowing reattachment to new controllers (ie, arm still works if tor's stopped then restarted - still in the works) - * change: full rewrite of the header panel, providing: - o notice for when tor's disconnected (with time-stamp) - o lightweight redrawing (smarter caching and moved updating into a daemon thread) - o more graceful handling of tiny displays - * change: rewrite of graph panel and related stats, providing: - o prepopulation of bandwidth information from the state file if possible - o observed and measured bandwidth stats (requested by arma) - o graph can be configured to display any numeric ps stat - o third option for graphing bounds (restricting to both local minima and maxima) - o substantially reduced redraw rate and making use of cached ps parameters (reducing call volume) - * fix: preventing 'command unavailable' error messages from going to stdout, which disrupts the display (caught by sid77) - * fix: removed -p option due to being a gaping security problem (caught by ioerror and nickm) - * fix: crashing issue if TorCtl reports TorCtlClosed before the first refresh (caught by Tas) - * fix: preventing the connection panel from initiating or resetting while in blind mode (caught by micah) - * fix: ss resolution wasn't specifying the use of numeric ports (caught by data) - * fix: parsing error when ExitPolicy is undefined (caught by Paul Menzel) - * fix: revised sleep pattern used for threads, greatly reducing the time it takes to quit - * fix: bug in defaulting the connection resolver to something predetermined to be available - * fix: stopping connection resolution (and related failover message) when tor's stopped - * fix: crashing issue when trying to resolve addresses without network connectivity - * fix: forgot to join on connection resolver when quitting - * fix: revised calculation for effective bandwidth rate to take MaxAdvertisedBandwidth into account - -4/8/10 - version 1.3.5 (r22148) -Utility and service rewrite (refactored roughly a third of the codebase, including revised APIs and much better documentation). - - * added: centralized logging utility for handling arm events, simplifying several parts of the interface - * added: rewrote connection resolver, including: - o fallback support for 'ss' and 'lsof' (requested by dun, John Case, and Christopher Davis) - o readjusts resolution rate if calls prove burdensome - o ui option for selecting mode of resolution - * added: rewrote hostname resolver, including: - o optional resolution via socket module (seems worse so disabled by default... pity) - o non-blocking thread safety - o extra error info - * change: revised curses wrapper utilities (plus some hacks of the interface to accommodate it) - * fix: issuing resets via RELOAD signal rather than sighup (thanks to Sebastian for pointing this out) - * fix: taking into account potential None values when running get_option on arbitrary values (caught by pipe and enki) - * fix: crashing problem if use_default_colors() calls failed (caught by sid77) - * fix: removed workaround for mysterious torrc validation bug (was accidentally already fixed - thanks to dun for lending a test environment) - * fix: size and time labels weren't doing integer truncation (rounding was unintended and frustratingly difficult to get rid of) - * fix: hack to prevent log panel from drawing before being positioned - * fix: arm crashed if torrc was an empty file - * fix: wasn't consistently bolding help keys - -3/7/10 - version 1.3.4 (r21852) -Weekend bugfix bundle. - - * added: returned option to reload torrc and added option to issue a sighup - * fix: header panel wasn't interpreting multi-line exit policies (caught by dun) - * fix: substantial display bug when stripping comments and torrc is bigger than the panel (caught by Paul Menzel) - * fix: deb specific hack for estimating the file descriptor limit was broken (caught by Paul Menzel) - * fix: skip printing stack trace in case of keyboard interrupt - * fix: updated listing of directory authorities (for tor version 0.2.1.24) - * fix: several uncaught exceptions when the network consensus couldn't be fetched - * fix: torrc comment stripping wasn't removing comments on the same lines as commands - * fix: torrc validation was failing under some conditions for CSV values (like ExitPolicy) - * fix (3/9/10, r21888): initializing error when processing family connections (caught by dun) - * fix (4/7/10, r22134): scrubbing wrong data for inbound connections (caught by waltman) - -2/27/10 - version 1.3.3 (r21772) -Hiding client/exit information to address privacy concerns and fixes for numerous issues brought up in irc. - - * added: scrubbing connection details of possible client and exit connections - * change: providing file descriptions in README, updated known issues and future plans in TODO - * change: added precision for bandwidth cap and burst if uneven values (requested by mete1989) - * fix: HiddenService* parameters fetched via a special option (caught by dun, karsten, and grumpy3) - * fix: workaround for os specific torrc validation bug - unfortunately haven't managed to repro yet so no fix (caught by grumpy3, Tas, and dun) - * fix: checking for python curses bindings at startup (caught by dun) - * fix: import error - TorCtl and socket missing from confPanel.py (caught by grumpy3) - * fix: showing external ip in connection panel rather than local nat address (caught by mete1989) - * fix: raised minimum width at which graph stats are displayed beside label (caught by dun) - * fix: wasn't treating "accept *" and "reject *" as catch-all policies - * fix: wasn't resizing graph panel properly in case of a sighup - -2/14/10 - version 1.3.2 (r21646) -Refactoring goodness and bug fixes. - - * change: revised curses utilities to further simplify interface implementations - * change: substantial layout changes (adding util and init packages) and including a copy of the gpl - * fix: bug with handing of DST for accounting's 'Time to reset' (patch provided by waltman) - * fix: header and connection panels weren't accounting for having ORListenAddress set (caught by waltman) - * fix: crashing bug when shrank too much for scrollbars to be drawn - * fix: couple system commands weren't redirecting their stderr to /dev/null - -2/7/10 - version 1.3.1 (r21580) -Had enough of a siesta - getting back into development beginning with a rewrite if the starter. - - * added: made authentication a little smarter, using PROTOCOLINFO to autodetect authentication type and cookie location - * change: made 'blind mode' (disables connection queries) a startup option rather than flag in source (request by Sebastian) - * change: all log events (including arm) are now set via character flags, with TorCtl events log as their own toggleable type - * change: starting log label with runlevel events, condensing if logging a range - * change: simplifying command line parsing via getopt - * fix: blind mode now prevents all netstats (including connection counts and halting resolver thread), improving performance - -11/29/09 - version 1.3.0 (r21062) -Weekend bugfix bundle. - - * added: most commands can be immediately executed from the help page (feature request by arma) - * fix: truncating header's version fields if too long (caught by hexa) - * fix: file descriptor dialog now provides a wider variety of error messages in case of failure - * fix: offset issue in connections listing when scroll bar was visible - * fix: removing family connections from listing when control port is closed - * fix: preventing TorCtl startup issues from going to stdout (duplicates warnings) - -11/8/09 - version 1.2.2 (r20927) -This will be the last update for a while since I'm about to start a new job. - - * added: including family relays on connections listing - * added: file descriptors dialog (stats and scrollable listing) - * change: logs warning if torrc fails to load - * fix: size and time labels used in torrc are expanded for validation - * fix: duplicate torrc entries weren't being detected if not erroneous - * fix: crashing issue when cleaning up hostname cache - * fix: stretching connection lines to fill full screen - -10/21/09 - version 1.2.1 (r20814) -Substantial bundle of changes including torrc validation, improved arm event logging, and numerous bug fixes. - - * added: verifies loaded torrc consistency against tor's actual state (gives warning and providing corrections) - * added: checks for torrc entries that are irrelevant due to duplication (gives notices and highlights) - * added: log provides TorCtl events (hack... so ugly...) - * added: option for logging runlevel events of arm, tor, or both - * added: ARM-DEBUG event for netstat query time - * added: providing progress bar when resolving a batch of hostnames - * change: providing prompt notice when tor's control port is closed - * fix: limiting pre-loaded events to this tor instance - * fix: limits log entries used to pre-load events (big logs caused issue with startup time) - * fix: properly closing TorCtl when quitting (was occasionally screwing up terminal) - * fix: at several points TorCtlClosed exceptions were uncaught, causing crashes when tor was closed - * fix: netstat and geoip failures were being noisy when tor quits - * fix: bug in tracking connection counts if tor quits when paused - * fix: sighup wasn't resetting all relevant internal variables - * fix: pausing bypassed connection sorting - -10/16/09 - version 1.2.0 (r20798) -Resolving a few small issues that bugged me. - - * change: using log file to pre-populate events if available - * change: asks for confirmation when quitting - * change: provides warning when tor's descriptors won't be updated - * change: event log now allows for multi-line messages - * fix: occasional crashing error concerning connection cache when paused - * fix: issue with tracking connection times when paused or not visible - -9/28/09 - version 1.1.3 (r20678) -More issues discussed on irc. - - * fix: made netstat lookups a best-effort service, separate from draw thread (caught by arma and StrangeCharm) - * fix: using ps as final fallback if otherwise unable to determine pid (suggested by Sebastian) - * fix: appends tor's pwd if torrc path is relative (caught by arma) - -9/27/09 - version 1.1.2 (r20674) -Few issues discussed on irc. - - * added: changelog and cleaned up todo documents (requested by arma) - * added: option in controller.py to disable connection panel (feature request by Sebastian) - * fix: failed to work on osx and bsd due to crashes after failed system calls (caught by Sebastian and Christopher Davis) - * fix: reloading static data in bandwidth panel after HUP (caught by hexa) - * fix: couple alignment issues with the connection listings - -9/23/09 - version 1.1.1 (r20655) -Bundle of semi-low hanging fruit, including a few issues discussed on irc. - - * added: showing extra parameters in connection listings if room's available - * added: identifying directory server connections - * change: providing an error message if running an incompatible python version (issue spotted by arma) - * change: giving arm a version to help in bug reports - * change: minor tweak to the wording of a faq entry (requested by Sebastian) - * fix: wasn't accounting for RelayBandwidthRate/Burst in effective bandwidth (caught by hexa and arma) - * fix: timing issue when shutting down (caught by arma) - * fix: couple issues with connection time being tracked when paused - * fix: preserving old results when netstat fails - -9/6/09 - r20493 -Several substantial features (last tasks for arm's todo list). - - * added: scroll bars for connections listing and event log - * added: made log scrollable (feature request by StrangeCharm) - * added: regular expression filtering for log (feature request by StrangeCharm) - * added: connection uptimes (time since connection was first made) - * added: identifying client from server connections and providing popup for client circuits - * added: graph for system resource usage (cpu/memory) - * change: removed cursor toggling option for connection page - * fix: minor display issue when changing event types - -8/22/09 - r20354 -Several fixes and changes, mostly concerning the graph panel and making better use of screen real estate. - - * added: labeled the graph's x-axis and reordered the information with changes omitted for small (tty sized) terminals (feature request by StrangeCharm) - * added: doubling up contents of header panel in case of wide screens to take advantage of added space - * added: exit policy to header if a wide display - * change: added precision for bandwidth measurements - * change: using "orconn-status" info to eliminated ambiguity in identifying inbound connection fingerprints (clever idea, but had very little impact) - * fix: when sighup signal is received reloads torrc and internal state (caught by StrangeCharm) - * fix: probable resolution of nasty concurrent bug concerning access to connection cache - * fix: minor issues concerning connection panel including graph widths and miscalculating local maxima - * fix: short circuits fingerprint cache when looking up localhost descriptor (preventing lookup failures) - * fix: minor issues with connection panel and description popups when no connections are available - * fix: descriptor popup wasn't determining if the first visible line belonged to an encryption block - * fix: made interface more resilient against arbitrary resizing (such as during popups) - -8/17/09 - r20331 -Work done over this last week. - - * added: popup for raw consensus description - * added: total bandwidth measurement (feature request by StrangeCharm) - * added: connection entry for lookup of local consensus data - * change: widened graphs to utilize full screen width (clever idea by StrangeCharm) - * change: preserving runtime and pid when shutting down - * change: few tweaks to the readme - * fix: joining on worker daemon threads to exit gracefully (had a noisy race condition) - * fix: using BW events to keep connection count graph in sync with bandwidth graph - * fix: can now support graphs of multiple sizes - -8/8/09 - r20233 -Rewrote graph panel so it can handle any real time statistics. - - * added: option to graph connection counts (feature request by phobos) - * added: custom graph bounds (global or local maxima) - -8/4/09 -Announced the project on the or-talk mailing list today which spurred an interview with Brenno Winter (who works on the cleverly named Little Sister project). The interview is available here. - -8/3/09 - r20210 -Added start of a faq to the readme in preparation for announcement on or-talk. - -7/30/09 - r20198 -Work done over the trip. - - * added: customizable update interval for bandwidth graph (feature request by StrangeCharm) - * change: noted new project page in the readme (www.atagar.com/arm) - * change: added word wrapping to conf panel - * change: added function for custom popup menus - * change: logs error message when required event types are unsupported rather than throwing an exception - * change: using different screenshot images - * fix: resolved issue that caused monitor to think tor was resumed when quit - * fix: bug with panel utility's resize detection - * fix: resorts connections after NEWDESC and NEWCONSENSUS events - * fix: forgetting to to resume monitor at multiple points after a temporary pause - * fix: minor refactoring based on suggestions from pylint (unused imports and such) - -7/22/09 - r20115 -Another small grab bag update. - - * added: version status to header panel - * change: noted "Common *nix commands including: ps, pidof, host, and netstat" among requirements in readme - * change: took some tricks from Mike's ConsensusTracker to further improve match rate - * fix: type mismatch that greatly diminished fingerprint matching - * fix: accidentally used idhash rather than idhex for fingerprints when updating cache with the contents of a NEWDESC event - -7/21/09 - r20100 -Quick fixes based on discussion on irc. - - * change: provides warning when geoip database is unavailable (thanks to SwissTorExit and karsten) - * fix: missing import for the socket module - -7/20/09 - r20096, r20097, r20098 -Couple fixes so arm plays nicely in the case of multiple running tor instances. - - * fix: can now deal with multiple tor instances: checks pid of process with the open control port - * fix: if only one tor process is running use that pid (netstat fails if running as a different user - -7/19/09 - r20087, r20090 -Last substantial feature on my to-do list. - - * added: connections can be selected to view consensus details (very spiffy!) - * added: listing selection is by menu rather than cycling - * fix: couple bugs, the most interesting being when netstat can't resolve a connections listing (spotted by phobos) - -7/18/09 - r20078, r20079 -Miscellaneous fix and feature batch. - - * added: relay's flags to the header - * added: listing by relay nickname - * added: additional event aliases and option for NEWCONSENSUS - * added (phobos): screenshot of arm in action so people can see what it looks like - * change: use constant "Listing" label for sorting rather than current view - * change: removed 'reload torrc' option (deceptive and useless) - * fix: updates cached consensus mappings with NEWDESC and NEWCONSENSUS events - -7/14/09 - r20016 -Resolved a few quick bugs: - - * fix: added fingerprint lookup cache to resolve substantial performance issue - * fix: hostname resolution progress accounts for newly added entries (no more negative progress) - * fix: resolved bug that prevented arm from starting if too small - * fix: ordering issue when sorting unresolved ip addresses - -7/11/09 - r19975 -Connections panel can now list by IP, hostname, or fingerprint: reverse resolution was easy, but comparing three different implementations and making it non-blocking with a pausable thread-pool backend? Not so much. - -7/8/09 - r19953, r19957 -Just got back from Toorcamp. Preliminary connection page and miscellaneous additions. - - * added: basic connection listing page (using netstat results) - * added: connection listing now has user configurable sort functionality (it's actually pretty spiffy: supports secondary and tertiary sub-keys) - * added: 'addfstr' to util which allows for embedded formatting tags (VERY helpful) - * added: help shows page's current settings - * added: made bandwidth panel toggleable - * added: avg bandwidth to bottom of panel - * fix: prevented header from being paused on page change - * fix: prevented bandwidth accounting events from being lost when paused - -6/14/09 - r19716 -Decently big batch of feature additions and bug fixes. - - * added: second page that presents torrc with syntax highlighting, optional comment stripping, etc - * added: ps sampling (cpu/memory usage, pid, and uptime) - * added: help popup with page controls - * fix: corrected issue that caused periodic refreshing to fail - * fix: accounting reset time takes into account DST - * fix: make accounting input and header pausable - -6/10/09 - r19708, r19709 -Couple quick changes. - - * change: removed '--path-to-torctl' startup option - * fix: accounting 'time to reset' now includes gmt to local conversion - -6/7/09 - r19646, r19655, r19656 -Couple features. - - * added: svn external inclusion of TorCtl - * added: bandwidth panel now displays accounting data if set - -6/6/09 - r19636, r19637 -Quick change based on discussion on irc. - - * added: command line argument to specify location of TorCtl without changing Python path first (feature request by phobos) - -6/5/09 - r19629 -Substantial refactoring changes. - - * change: switched from a functional to an OO implementation which further simplified the controller: as an added plus this should make adding additional 'pages' trivial - * change: offloaded resizing to the curses wrapper - * fix: dealt with another curses wtf bug where panels wouldn't repaint unless done in a specific order - -6/4/09 - r19626 -Tested and corrected formatting for all event types except STREAM and STREAM_BW (not sure how to make those occur...). - -6/2/09 - r19615, r19619, r19620 -Introduced layer of abstraction from curses, simplifying its use and greatly improving reliability. - - * added: introduced wrapper to hide curses ugliness which greatly simplified interface code - * added: notice when relay's been silent for five seconds (based on BW events so probably due to Tor being closed), another idea by karsten - * changed: unchecked events have stubs to present information and provide debugging information in case of type mismatch - * fix: all problems with resizing: it's now rock solid - -5/29/09 - r19580, r19594 -Fixes for several rather sinister reliability problems: - - * added: allows logged events to be changed while running (suggested feature by karsten) and experimenting with a more modular design - * fix: added non-blocking reentrant locks to fix concurrency errors that caused chaotic terminal glitches (such as switching to a Chinese character set) - * fix: now fully handles resizing (including vertical) - * fix: using new capabilities in TorCtl including cookie authentication and disabling logging - * fix: bandwidth graph bug when paused - * fix: occasionally refreshes static content in case of graphical hiccups - * fix: added workaround for obscure curses caching bug that prevented portions of the screen from being redrawn - * fix: bug preventing initialization if too small - -5/25/09 - r19567 -Few small tweaks including: - - * added: tiny shell script to alias starting - * added: more informative error message if TorCtl isn't available - * change: defaultly logged events - * change: make inclusion of 'unknown' events toggleable - -5/24/09 - r19548, r19549, r19550, r19551 -Initial version of arm (terminal relay status monitor). Repository set up by arma. - - * fix: bug concerning undefined exit policy - * fix: resolved issue that prevented monitor from functioning in terminals without curs_set support - - Deleted: arm/trunk/LICENSE =================================================================== --- arm/trunk/LICENSE 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/trunk/LICENSE 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. Deleted: arm/trunk/README =================================================================== --- arm/trunk/README 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/trunk/README 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,180 +0,0 @@ -arm (anonymizing relay monitor) - Terminal status monitor for Tor relays. -Developed by Damian Johnson (www.atagar.com - atagar1(a)gmail.com) -All code under the GPL v3 (http://www.gnu.org/licenses/gpl.html) -Project page: www.atagar.com/arm - -Description: -Command line application for monitoring Tor relays, providing real time status -information such as the current configuration, bandwidth usage, message log, -connections, etc. This uses a curses interface much like 'top' does for system -usage. The application is intended for command-line aficionados, ssh -connections, and anyone stuck with a tty terminal for checking their relay's -status. Releases should be stable so if you manage to make it crash (or have a -feature request) then please let me know! - -The project was originally proposed in 2008 by Jacob and Karsten: - http://archives.seul.org/or/dev/Jan-2008/msg00005.html - -An interview by Brenno Winter discussing the project is available at: - http://www.atagar.com/arm/HFM_INT_0001.mp3 - -Requirements: -Python 2.5 -TorCtl (this is included with arm) -Tor is running with an available control port. This means either... - ... starting Tor with '--controlport <PORT>' - ... or including 'ControlPort <PORT>' in your torrc - -It's also highly suggested for the control port to require authentication. -This can be done either with a cookie or password: - * Cookie Authentication - Controllers authenticate to Tor by providing the - contents of the control_auth_cookie file. To set this up... - - add "CookieAuthentication 1" to your torrc - - either restart Tor or run "pkill -sighup tor" - - this method of authentication is automatically handled by arm, so you - can still start arm as you normally would - - * Password Authentication - Attaching to the control port requires a - password. To set this up... - - run "tor --hash-password <your password>" - - add "HashedControlPassword <hashed password>" to your torrc - - either restart Tor or run "pkill -sighup tor" - - when starting up arm will prompt you for this password - -For full functionality this also needs: -- To be ran with the same user as tor to avoid permission issues with - connection resolution and reading the torrc. - -- Common *nix commands including: - * ps - * a method of connection resolution (any of the following): - * sockstat - * netstat - * ss - * lsof - * procstat - * tail - * pwdx - * ulimit - * pgrep or pidof - * host (if dns lookups are enabled) - -This is started via 'arm' (use the '--help' argument for usage). - -------------------------------------------------------------------------------- - -FAQ: -> Why is it called 'arm'? - -Simple - because it makes the command short and memorable. Terminal -applications need to be easy to type (like 'top', 'ssh', etc), and anything -longer is just begging command-line aficionados to alias it down. I chose the -meaning of the acronym ('anonymizing relay monitor') afterward. - -> If you're listing connections then what about exit nodes? Won't this include -people's traffic? - -No. Potential client and exit connections are specifically scrubbed of -identifying information. Be aware that it's highly discouraged for relay -operators to fetch this data, so please don't. - -> Is it harmful to share the information provided by arm? - -Not really, but it's discouraged. The original plan for arm included a special -emphasis that it wouldn't log any data. The reason is that if a large number of -relay operators published the details of their connections then correlation -attacks could break Tor user's anonymity. Just show some moderation in what you -share and it should be fine. - -> Is there any chance that arm will leak data? - -Not by default, arm is a passive listener with one exception. The second page -(connections) provides the hostnames of Tor relays you're connected to. This -means reverse DNS lookups which, if monitored, could leak your current -connections to an eavesdropper. However, this is disabled by default and -lookups are only made upon request (when showing connection details or listing -connections by hostname). See the page's help for how to enable lookups. - -That said, this is not a terribly big whoop. ISPs and anyone sniffing your -connection already have this data - the only difference is that instead of -saying "I am talking to x" you're saying "I'm talking to x, who's x?", meaning -the resolver's also aware of who they are. - -> When arm starts it gives "Unable to resolve tor pid, abandoning connection -listing"... why? - -If you're running multiple instances of tor then arm needs to figure out which -pid belongs to the open control port. If it's running as a different user (such -as being in a chroot jail) then it's probably failing due to permission issues. -Arm still runs, just no connection listing or ps stats. - -> The bandwidth graph showing up - -Some terminals, most notably screen sessions on Gentoo, appear to have a bug -where highlighted spaces aren't rendered. A reported workaround is to set: - TERM="rxvt-unicode" - -------------------------------------------------------------------------------- - -Layout: - -./ - arm - startup script - install - installation script - - arm.1 - man page - armrc.sample - example arm configuration file with defaults - ChangeLog - revision history - LICENSE - copy of the gpl v3 - README - um... guess you figured this one out - setup.py - distutils installation script for arm - - src/ - __init__.py - starter.py - parses and validates commandline parameters - prereq.py - checks python version and for required packages - version.py - version and last modified information - test.py - method for starting tests and demos - settings.cfg - attributes loaded for parsing tor related data - torConfigDesc.txt - fallback descriptions of Tor's configuration options - uninstall - removal script - - interface/ - connections/ - __init__.py - connPanel.py - (page 2) lists the active tor connections - circEntry.py - circuit entries in the connection panel - connEntry.py - individual connections to or from the system - entries.py - common parent for connPanel display entries - - graphing/ - __init__.py - graphPanel.py - (page 1) presents graphs for data instances - bandwidthStats.py - tracks tor bandwidth usage - psStats.py - tracks system information (such as cpu/memory usage) - connStats.py - tracks number of tor connections - - __init__.py - controller.py - main display loop, handling input and layout - headerPanel.py - top of all pages, providing general information - descriptorPopup.py - (popup) displays connection descriptor data - - logPanel.py - (page 1) displays tor, arm, and torctl events - connPanel.py - (page 2) deprecated counterpart for connections/* - configPanel.py - (page 3) editor panel for the tor configuration - torrcPanel.py - (page 4) displays torrc and validation - - util/ - __init__.py - conf.py - loading and persistence for user configuration - connections.py - service providing periodic connection lookups - enum.py - enumerations for ordered collections - hostnames.py - service providing nonblocking reverse dns lookups - log.py - aggregator for application events - panel.py - wrapper for safely working with curses subwindows - procTools.py - queries process & system information from /proc contents - sysTools.py - helper for system calls, providing client side caching - torConfig.py - functions for working with the torrc and config options - torTools.py - TorCtl wrapper, providing caching and derived information - uiTools.py - helper functions for presenting the user interface - Added: arm/trunk/README =================================================================== --- arm/trunk/README (rev 0) +++ arm/trunk/README 2011-04-20 15:46:23 UTC (rev 24662) @@ -0,0 +1,6 @@ +Did you come here looking for arm's source code repository? Arm has been +migrated to Git and is now available at: +git://git.torproject.org/arm.git + +For web-based access, use https://gitweb.torproject.org/arm.git + Deleted: arm/trunk/arm =================================================================== --- arm/trunk/arm 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/trunk/arm 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,13 +0,0 @@ -#!/bin/sh -if [ "$0" = /usr/bin/arm ]; then - arm_base=/usr/share/arm/ -else - arm_base=$( dirname "$0" )/src/ -fi - -python "${arm_base}prereq.py" - -if [ $? = 0 ]; then - exec python -W ignore::DeprecationWarning "${arm_base}starter.py" $* -fi - Deleted: arm/trunk/arm.1 =================================================================== --- arm/trunk/arm.1 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/trunk/arm.1 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,74 +0,0 @@ -.TH arm 1 "27 August 2010" -.SH NAME -arm - Terminal Tor status monitor - -.SH SYNOPSIS -arm [\fIOPTION\fR] - -.SH DESCRIPTION -The anonymizing relay monitor (arm) is a terminal status monitor for Tor -relays, intended for command-line aficionados, ssh connections, and anyone -stuck with a tty terminal. This works much like top does for system usage, -providing real time statistics for: - * bandwidth, cpu, and memory usage - * relay's current configuration - * logged events - * connection details (ip, hostname, fingerprint, and consensus data) - * etc - -Defaults and interface properties are configurable via a user provided -configuration file (for an example see the provided \fBarmrc.sample\fR). -Releases and information are available at \fIhttp://www.atagar.com/arm\fR. - -.SH OPTIONS -.TP -\fB\-i\fR, \fB\-\-interface [ADDRESS:]PORT\fR -tor control port arm should attach to (default is \fB127.0.0.1:9051\fR) - -.TP -\fB\-c\fR, \fB\-\-config CONFIG_PATH\fR -user provided configuration file (default is \fB~/.armrc\fR) - -.TP -\fB\-d\fR, \fB\-\-debug\fR -writes all arm logs to /home/atagar/.arm/log - -.TP -\fB\-b\fR, \fB\-\-blind\fR -disable connection lookups (netstat, lsof, and ss), dropping the parts of the -interface that rely on this information - -.TP -\fB\-e\fR, \fB\-\-event EVENT_FLAGS\fR -flags for tor, arm, and torctl events to be logged (default is \fBN3\fR) - - d DEBUG a ADDRMAP k DESCCHANGED s STREAM - i INFO f AUTHDIR_NEWDESCS g GUARD r STREAM_BW - n NOTICE h BUILDTIMEOUT_SET l NEWCONSENSUS t STATUS_CLIENT - w WARN b BW m NEWDESC u STATUS_GENERAL - e ERR c CIRC p NS v STATUS_SERVER - j CLIENTS_SEEN q ORCONN - DINWE tor runlevel+ A All Events - 12345 arm runlevel+ X No Events - 67890 torctl runlevel+ U Unknown Events - -.TP -\fB\-v\fR, \fB\-\-version\fR -provides version information - -.TP -\fB\-h\fR, \fB\-\-help\fR -provides usage information - -.SH FILES -.TP -\fB~/.armrc\fR -Your personal arm configuration file - -.TP -\fB/usr/share/doc/arm/armrc.sample\fR -Sample armrc configuration file that documents all options - -.SH AUTHOR -Written by Damian Johnson (atagar1(a)gmail.com) - Deleted: arm/trunk/armrc.sample =================================================================== --- arm/trunk/armrc.sample 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/trunk/armrc.sample 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,285 +0,0 @@ -# Startup options -startup.controlPassword -startup.interface.ipAddress 127.0.0.1 -startup.interface.port 9051 -startup.blindModeEnabled false -startup.events N3 -startup.dataDirectory ~/.arm - -# Seconds between querying information -queries.resourceUsage.rate 5 -queries.connections.minRate 5 -queries.refreshRate.rate 5 - -# Read the proc contents directly instead of calling ps, netstat, and other -# resolvers. This provides very sizable performance benefits (around 90% -# faster lookups) but this is only available on Linux. -queries.useProc true - -# Renders the interface with color if set and the terminal supports it -features.colorInterface true - -# Checks the torrc for issues, warning and hilighting problems if true -features.torrc.validate true - -# Set this if you're running in a chroot jail or other environment where tor's -# resources (log, state, etc) should have a prefix in their paths. -features.pathPrefix - -# If set, arm appends any log messages it reports while running to the given -# log file. This does not take filters into account or include prepopulated -# events. -features.logFile - -# If true, the header panel always shows the file descriptor usage. Otherwise -# this is only displayed when we're running out. -features.showFdUsage false - -# Paremters for the log panel -# --------------------------- -# showDateDividers -# show borders with dates for entries from previous days -# showDuplicateEntries -# shows all log entries if true, otherwise collapses similar entries with an -# indicator for how much is being hidden -# entryDuration -# number of days log entries are kept before being dropped (if zero then -# they're kept until cropped due to caching limits) -# maxLinesPerEntry -# max number of lines to display for a single log entry -# prepopulate -# attempts to read past events from the log file if true -# prepopulateReadLimit -# maximum entries read from the log file, used to prevent huge log files from -# causing a slow startup time. -# maxRefreshRate -# rate limiting (in milliseconds) for drawing the log if updates are made -# rapidly (for instance, when at the DEBUG runlevel) - -features.log.showDateDividers true -features.log.showDuplicateEntries false -features.log.entryDuration 7 -features.log.maxLinesPerEntry 4 -features.log.prepopulate true -features.log.prepopulateReadLimit 5000 -features.log.maxRefreshRate 300 - -# Paremters for the config panel -# --------------------------- -# order -# three comma separated configuration attributes, options including: -# 0 -> Category, 1 -> Option Name, 2 -> Value, 3 -> Arg Type, -# 4 -> Arg Usage, 5 -> Summary, 6 -> Description, 7 -> Man Entry, -# 8 -> Is Default -# selectionDetails.height -# rows of data for the panel showing details on the current selection, this -# is disabled entirely if zero -# features.config.prepopulateEditValues -# when editing config values the current value is prepopulated if true, and -# left blank otherwise -# state.colWidth.* -# column content width -# state.showPrivateOptions -# tor provides config options of the form "__<option>" that can be dangerous -# to set, if true arm provides these on the config panel -# state.showVirtualOptions -# virtual options are placeholders for other option groups, never having -# values or being setable themselves -# file.showScrollbars -# displays scrollbars when the torrc content is longer than the display -# file.maxLinesPerEntry -# max number of lines to display for a single entry in the torrc - -features.config.order 7, 1, 8 -features.config.selectionDetails.height 6 -features.config.prepopulateEditValues true -features.config.state.colWidth.option 25 -features.config.state.colWidth.value 15 -features.config.state.showPrivateOptions false -features.config.state.showVirtualOptions false -features.config.file.showScrollbars true -features.config.file.maxLinesPerEntry 8 - -# Descriptions for tor's configuration options can be loaded from its man page -# to give usage information on the settings page. They can also be persisted to -# a file to speed future lookups. -# --------------------------- -# enabled -# allows the descriptions to be fetched from the man page if true -# persist -# caches the descriptions (substantially saving on future startup times) - -features.config.descriptions.enabled true -features.config.descriptions.persist true - -# General graph parameters -# ------------------------ -# height -# height of graphed stats -# maxWidth -# maximum number of graphed entries -# interval -# 0 -> each second, 1 -> 5 seconds, 2 -> 30 seconds, 3 -> minutely, -# 4 -> 15 minutes, 5 -> half hour, 6 -> hourly, 7 -> daily -# bound -# 0 -> global maxima, 1 -> local maxima, 2 -> tight -# type -# 0 -> None, 1 -> Bandwidth, 2 -> Connections, 3 -> System Resources -# showIntermediateBounds -# shows y-axis increments between the top/bottom bounds - -features.graph.height 7 -features.graph.maxWidth 150 -features.graph.interval 0 -features.graph.bound 1 -features.graph.type 1 -features.graph.showIntermediateBounds true - -# Parameters for graphing bandwidth stats -# --------------------------------------- -# prepopulate -# attempts to use tor's state file to prepopulate the bandwidth graph at the -# 15-minute interval (this requires the minimum of a day's worth of uptime) -# prepopulateTotal -# populates the total stat from the state file if true (this only contains -# the last day's worth of information, so this metric isn't the true total) -# transferInBystes -# shows rate measurments in bytes if true, bits otherwise -# accounting.show -# provides accounting stats if AccountingMax was set -# accounting.rate -# seconds between querying accounting stats -# accounting.isTimeLong -# provides verbose measurements of time if true - -features.graph.bw.prepopulate true -features.graph.bw.prepopulateTotal false -features.graph.bw.transferInBytes false -features.graph.bw.accounting.show true -features.graph.bw.accounting.rate 10 -features.graph.bw.accounting.isTimeLong false - -# Parameters for connection display -# --------------------------------- -# oldPanel -# includes the old connection panel in the interface -# newPanel -# includes the new connection panel in the interface -# listingType -# the primary category of information shown by default, options including: -# 0 -> IP Address / Port 1 -> Hostname -# 2 -> Fingerprint 3 -> Nickname -# order -# three comma separated configuration attributes, options including: -# 0 -> Category, 1 -> Uptime, 2 -> Listing, 3 -> IP Address, -# 4 -> Port, 5 -> Hostname, 6 -> Fingerprint, 7 -> Nickname, -# 8 -> Country -# refreshRate -# rate at which the connection panel contents is redrawn (if higher than the -# connection resolution rate then reducing this won't casue new data to -# appear more frequently - just increase the rate at which the uptime field -# is updated) -# resolveApps -# issues lsof queries to determining the applications involved in local -# SOCKS and CONTROL connections -# markInitialConnections -# if true, the uptime of the initial connections when we start are marked -# with a '+' (these uptimes are estimates since arm can only track a -# connection's duration while it runs) -# showExitPort -# shows port related information of exit connections we relay if true -# showColumn.* -# toggles the visability of the connection table columns - -features.connection.oldPanel false -features.connection.newPanel true -features.connection.listingType 0 -features.connection.order 0, 2, 1 -features.connection.refreshRate 5 -features.connection.resolveApps true -features.connection.markInitialConnections true -features.connection.showExitPort true -features.connection.showColumn.fingerprint true -features.connection.showColumn.nickname true -features.connection.showColumn.destination true -features.connection.showColumn.expandedIp true - -# Thread pool size for hostname resolutions -# Determines the maximum number of concurrent requests. Upping this to around -# thirty or so seems to be problematic, causing intermittently seizing. - -queries.hostnames.poolSize 5 - -# Method of resolving hostnames -# If true, uses python's internal "socket.gethostbyaddr" to resolve addresses -# rather than the host command. This is ignored if the system's unable to make -# parallel requests. Resolving this way seems to be much slower than host calls -# in practice. - -queries.hostnames.useSocketModule false - -# Caching parameters -cache.sysCalls.size 600 -cache.hostnames.size 700000 -cache.hostnames.trimSize 200000 -cache.logPanel.size 1000 -cache.armLog.size 1000 -cache.armLog.trimSize 200 - -# Runlevels at which arm logs its events -log.startTime INFO -log.refreshRate DEBUG -log.highCpuUsage WARN -log.configEntryNotFound NONE -log.configEntryUndefined NOTICE -log.configEntryTypeError NOTICE -log.torCtlPortClosed NOTICE -log.torGetInfo DEBUG -log.torGetInfoCache NONE -log.torGetConf DEBUG -log.torGetConfCache NONE -log.torSetConf INFO -log.torEventTypeUnrecognized NOTICE -log.torPrefixPathInvalid NOTICE -log.procCallMade DEBUG -log.sysCallMade DEBUG -log.sysCallCached NONE -log.sysCallFailed INFO -log.sysCallCacheGrowing INFO -log.panelRecreated DEBUG -log.graph.bw.prepopulateSuccess NOTICE -log.graph.bw.prepopulateFailure NOTICE -log.logPanel.prepopulateSuccess INFO -log.logPanel.prepopulateFailed WARN -log.logPanel.logFileOpened NOTICE -log.logPanel.logFileWriteFailed ERR -log.logPanel.forceDoubleRedraw DEBUG -log.torrc.readFailed WARN -log.torrc.validation.torStateDiffers WARN -log.torrc.validation.unnecessaryTorrcEntries NOTICE -log.configDescriptions.readManPageSuccess INFO -log.configDescriptions.readManPageFailed NOTICE -log.configDescriptions.unrecognizedCategory NOTICE -log.configDescriptions.internalLoadSuccess NOTICE -log.configDescriptions.internalLoadFailed ERR -log.configDescriptions.persistance.loadSuccess INFO -log.configDescriptions.persistance.loadFailed INFO -log.configDescriptions.persistance.saveSuccess NOTICE -log.configDescriptions.persistance.saveFailed NOTICE -log.connResolverOptions INFO -log.connLookupFailed INFO -log.connLookupFailover NOTICE -log.connLookupAbandon WARN -log.connLookupRateGrowing NONE -log.hostnameCacheTrimmed INFO -log.cursesColorSupport INFO -log.bsdJailFound INFO -log.unknownBsdJailId WARN -log.geoipUnavailable WARN -log.stats.failedProcResolution DEBUG -log.stats.procResolutionFailover INFO -log.stats.failedPsResolution INFO -log.savingDebugLog NOTICE -log.fdUsageSixtyPercent NOTICE -log.fdUsageNinetyPercent WARN - Deleted: arm/trunk/install =================================================================== --- arm/trunk/install 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/trunk/install 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,15 +0,0 @@ -#!/bin/sh -python src/prereq.py - -if [ $? = 0 ]; then - python setup.py -q install - - # provide notice if we installed successfully - if [ $? = 0 ]; then - echo "installed to /usr/share/arm" - fi - - # cleans up the automatically built temporary files - rm -rf ./build -fi - Deleted: arm/trunk/setup.py =================================================================== --- arm/trunk/setup.py 2011-04-18 22:15:05 UTC (rev 24661) +++ arm/trunk/setup.py 2011-04-20 15:46:23 UTC (rev 24662) @@ -1,103 +0,0 @@ -#!/usr/bin/env python -import os -import sys -import gzip -import tempfile -from src.version import VERSION -from distutils.core import setup - -# Use 'tor-arm' instead of 'arm' in the path for the sample armrc if we're -# building for debian. - -isDebInstall = False -for arg in sys.argv: - if "tor-arm" in arg: - isDebInstall = True - break - -docPath = "/usr/share/doc/%s" % ("tor-arm" if isDebInstall else "arm") - -# Allow the docPath to be overridden via a '--docPath' argument. This is to -# support custom documentation locations on Gentoo, as discussed in: -# https://bugs.gentoo.org/349792 - -try: - docPathFlagIndex = sys.argv.index("--docPath") - if docPathFlagIndex < len(sys.argv) - 1: - docPath = sys.argv[docPathFlagIndex + 1] - - # remove the custom --docPath argument (otherwise the setup call will - # complain about them) - del sys.argv[docPathFlagIndex:docPathFlagIndex + 3] - else: - print "No path provided for --docPath" - sys.exit(1) -except ValueError: pass # --docPath flag not found - -# Provides the configuration option to install to "/usr/share" rather than as a -# python module. Alternatives are to either provide this as an input argument -# (not an option for deb/rpm builds) or add a setup.cfg with: -# [install] -# install-purelib=/usr/share -# which would mean a bit more unnecessary clutter. - -manFilename = "arm.1" -if "install" in sys.argv: - sys.argv += ["--install-purelib", "/usr/share"] - - # Compresses the man page. This is a temporary file that we'll install. If - # something goes wrong then we'll print the issue and use the uncompressed man - # page instead. - - try: - manInputFile = open('arm.1', 'r') - manContents = manInputFile.read() - manInputFile.close() - - # temporary destination for the man page guarenteed to be unoccupied (to - # avoid conflicting with files that are already there) - tmpFilename = tempfile.mktemp("/arm.1.gz") - - # make dir if the path doesn't already exist - baseDir = os.path.dirname(tmpFilename) - if not os.path.exists(baseDir): os.makedirs(baseDir) - - manOutputFile = gzip.open(tmpFilename, 'wb') - manOutputFile.write(manContents) - manOutputFile.close() - - # places in tmp rather than a relative path to avoid having this copy appear - # in the deb and rpm builds - manFilename = tmpFilename - except IOError, exc: - print "Unable to compress man page: %s" % exc - -setup(name='arm', - version=VERSION, - description='Terminal tor status monitor', - license='GPL v3', - author='Damian Johnson', - author_email='atagar(a)torproject.org', - url='http://www.atagar.com/arm/', - packages=['arm', 'arm.interface', 'arm.interface.graphing', 'arm.interface.connections', 'arm.util', 'arm.TorCtl'], - package_dir={'arm': 'src'}, - data_files=[("/usr/bin", ["arm"]), - ("/usr/share/man/man1", [manFilename]), - (docPath, ["armrc.sample"]), - ("/usr/share/arm", ["src/settings.cfg"])], - ) - -# Cleans up the temporary compressed man page. -if manFilename != 'arm.1' and os.path.isfile(manFilename): - if "-q" not in sys.argv: print "Removing %s" % manFilename - os.remove(manFilename) - -# Removes the egg_info file. Apparently it is not optional during setup -# (hardcoded in distutils/command/install.py), nor are there any arguments to -# bypass its creation. The deb build removes this as part of its rules script. -eggPath = '/usr/share/arm-%s.egg-info' % VERSION - -if not isDebInstall and os.path.isfile(eggPath): - if "-q" not in sys.argv: print "Removing %s" % eggPath - os.remove(eggPath) -

1 0

[metrics-tasks/master] Add graph code for #2394.
by karsten＠torproject.org 20 Apr '11

20 Apr '11

commit c6887f322a243ef5526e2b793c5e461936722080 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 20 12:01:00 2011 +0200 Add graph code for #2394. --- task-2394/.gitignore | 1 + task-2394/bandwidth-comparison.R | 153 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 154 insertions(+), 0 deletions(-) diff --git a/task-2394/.gitignore b/task-2394/.gitignore index bef5dec..1e3c939 100644 --- a/task-2394/.gitignore +++ b/task-2394/.gitignore @@ -3,4 +3,5 @@ descriptors/ *.pdf *.csv *.jar +*.png diff --git a/task-2394/bandwidth-comparison.R b/task-2394/bandwidth-comparison.R new file mode 100644 index 0000000..77a5842 --- /dev/null +++ b/task-2394/bandwidth-comparison.R @@ -0,0 +1,153 @@ +options(warn = -1) +suppressPackageStartupMessages(library("ggplot2")) + +b <- read.csv("bandwidth-comparison.csv", stringsAsFactors = FALSE) + +# Plot ECDF to compare categories +cdf_relays_category <- function(data, category) { + d <- data[data$category == category & data$descriptorbandwidth > 0, ] + d <- sort(d$consensusbandwidth * 1000 / d$descriptorbandwidth) + d <- data.frame(x = d, y = (1:length(d)) / length(d), + category = category) + d +} +relays_category <- rbind( + cdf_relays_category(b, "Guard & Exit (default policy)"), + cdf_relays_category(b, "Exit (default policy)"), + cdf_relays_category(b, "Guard & Exit (non-default policy)"), + cdf_relays_category(b, "Exit (non-default policy)"), + cdf_relays_category(b, "Guard"), + cdf_relays_category(b, "Middle")) +ggplot(relays_category, aes(x = x, y = y, colour = category)) + +geom_line() + +scale_x_log10("\nRatio of measured by self-reported bandwidth", + limits = c(0.1, 10), breaks = c(0.1, 0.2, 0.5, 1, 2, 5, 10), + labels = c("0.1", "0.2", "0.5", "1", "2", "5", "10")) + +scale_y_continuous("Fraction of relays\n", limits = c(0, 1), + formatter = "percent") + +scale_colour_hue("") + +geom_vline(xintercept = 1, legend = FALSE, linetype = "dashed") + +opts(title = "Ratio between measured and self-reported relay bandwidth", + legend.position = "top") +ggsave(filename = "bandwidth-comparison-relays.png", + width = 8, height = 5, dpi = 150) + +stopit + +# Plot ECDFs to compare consensus to votes +cdf_relays_category_votes <- function(data, category) { + d <- data[data$category == category & data$descriptorbandwidth > 0, ] + consensus <- sort(d$consensusbandwidth * 1000 / d$descriptorbandwidth) + ides <- sort(d$idesbandwidth * 1000 / d$descriptorbandwidth) + urras <- sort(d$urrasbandwidth * 1000 / d$descriptorbandwidth) + moria1 <- sort(d$moria1bandwidth * 1000 / d$descriptorbandwidth) + gabelmoo <- sort(d$gabelmoobandwidth * 1000 / d$descriptorbandwidth) + d <- rbind( + data.frame(x = consensus, + y = (1:length(consensus)) / length(consensus), + source = "consensus", + category = category), + data.frame(x = ides, + y = (1:length(ides)) / length(ides), + source = "ides", + category = category), + data.frame(x = urras, + y = (1:length(urras)) / length(urras), + source = "urras", + category = category), + data.frame(x = moria1, + y = (1:length(moria1)) / length(moria1), + source = "moria1", + category = category), + data.frame(x = gabelmoo, + y = (1:length(gabelmoo)) / length(gabelmoo), + source = "gabelmoo", + category = category)) + d +} +relays_category_votes <- rbind( + cdf_relays_category_votes(b, "Guard & Exit (default policy)"), + cdf_relays_category_votes(b, "Exit (default policy)"), + cdf_relays_category_votes(b, "Guard & Exit (non-default policy)"), + cdf_relays_category_votes(b, "Exit (non-default policy)"), + cdf_relays_category_votes(b, "Guard"), + cdf_relays_category_votes(b, "Middle")) +ggplot(relays_category_votes, aes(x = x, y = y, colour = source)) + +geom_line() + +facet_wrap(~ category, ncol = 3) + +scale_x_log10("\nRatio of measured by self-reported bandwidth", + limits = c(0.1, 10), breaks = c(0.1, 1, 10), + labels = c("0.1", "1", "10")) + +scale_y_continuous("Fraction of relays\n", limits = c(0, 1), + formatter = "percent") + +scale_colour_manual("", + breaks = c("consensus", "ides", "urras", "moria1", "gabelmoo"), + values = c("black", rep(alpha("black", 0.25), 4))) + +geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + +opts(title = paste("Measured vs. self-reported bandwidth ratios in", + "consensus and votes\n"), legend.position = "none") +ggsave(filename = "bandwidth-comparison-relays-votes.png", + width = 8, height = 5, dpi = 150) + +# Plot _weighted_ ECDFs +wecdf <- function(data, source, category) { + data <- data[with(data, order(ratio)), ] + sum_measured <- sum(data$measured, na.rm = TRUE) + cur_measured <- data$measured[1] + res <- data.frame(x = data$ratio[1], + y = cur_measured / sum_measured, + source = source, category = category) + for (i in 2:length(data$ratio)) { + cur_measured <- cur_measured + data$measured[i] + res <- rbind(res, data.frame(x = data$ratio[i], + y = cur_measured / sum_measured, + source = source, category = category)) + } + res +} +cdf_measured_category_votes <- function(data, category) { + d <- data[data$category == category & data$descriptorbandwidth > 0, ] + d <- rbind( + wecdf(data.frame( + ratio = d$consensusbandwidth * 1000 / d$descriptorbandwidth, + measured = d$consensusbandwidth), "consensus", category), + wecdf(data.frame( + ratio = d$idesbandwidth * 1000 / d$descriptorbandwidth, + measured = d$idesbandwidth), "ides", category), + wecdf(data.frame( + ratio = d$urrasbandwidth * 1000 / d$descriptorbandwidth, + measured = d$urrasbandwidth), "urras", category), + wecdf(data.frame( + ratio = d$moria1bandwidth * 1000 / d$descriptorbandwidth, + measured = d$moria1bandwidth), "moria1", category), + wecdf(data.frame( + ratio = d$gabelmoobandwidth * 1000 / d$descriptorbandwidth, + measured = d$gabelmoobandwidth), "gabelmoo", category)) + d +} +measured_category_votes <- rbind( + cdf_measured_category_votes(b, "Guard & Exit (default policy)"), + cdf_measured_category_votes(b, "Exit (default policy)"), + cdf_measured_category_votes(b, "Guard & Exit (non-default policy)"), + cdf_measured_category_votes(b, "Exit (non-default policy)"), + cdf_measured_category_votes(b, "Guard"), + cdf_measured_category_votes(b, "Middle")) +ggplot(measured_category_votes, aes(x = x, y = y, colour = source)) + +geom_line() + +facet_wrap(~ category, ncol = 3) + +scale_x_log10("\nRatio of measured by self-reported bandwidth", + limits = c(0.1, 10), breaks = c(0.1, 1, 10), + labels = c("0.1", "1", "10")) + +scale_y_continuous("Fraction of measured bandwidth\n", limits = c(0, 1), + formatter = "percent") + +scale_colour_manual("", + breaks = c("consensus", "ides", "urras", "moria1", "gabelmoo"), + values = c("black", rep(alpha("black", 0.25), 4))) + +geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + +opts(title = paste("Measured vs. self-reported bandwidth ratios in", + "consensus and votes\n"), legend.position = "none") +ggsave(filename = "bandwidth-comparison-measured-votes.png", + width = 8, height = 5, dpi = 150) +write.csv(measured_category_votes, "measured_category_votes-temp.csv", + quote = FALSE, row.names = FALSE) +

1 0

[tor/master] Prevent hugely inflated observed bandwidth values
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit 3f7f96d9e7aa2254d62d63530c37ee96d4b3abc8 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 19 16:00:41 2011 +0200 Prevent hugely inflated observed bandwidth values When reading the bw history from the state file, we'd add the 900-second value as traffic that occured during one second. Fix that by adding the average value to each second. This bug was present since 0.2.0.5-alpha, but was hidden until 0.2.23-alpha when we started using the saved values. --- changes/bug2704_part2 | 5 +++++ src/or/rephist.c | 19 ++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/changes/bug2704_part2 b/changes/bug2704_part2 new file mode 100644 index 0000000..962c8b7 --- /dev/null +++ b/changes/bug2704_part2 @@ -0,0 +1,5 @@ + o Major bugfixes: + - Prevent relays that read their bandwidth history from their state file + from arbitrarily inflating that value. Fixes the second half of bug + 2704, bugfix on tor-0.2.2.23-alpha. + diff --git a/src/or/rephist.c b/src/or/rephist.c index 6034bbc..fb091d5 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1686,11 +1686,24 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, } if (start < now) { - add_obs(b, start, v); + time_t cur_start = start; + time_t actual_interval_len = s_interval; + uint64_t cur_val = 0; + /* Calculate the average per second. This is the best we can do + * because our state file doesn't have per-second resolution. */ + if (start + s_interval > now) + actual_interval_len = now - start; + cur_val = v / actual_interval_len; + /* This is potentially inefficient, but since we don't do it very + * often it should be ok. */ + while (cur_start < start + actual_interval_len) { + add_obs(b, cur_start, cur_val); + ++cur_start; + } b->max_total = mv; /* This will result in some fairly choppy history if s_interval - * is notthe same as NUM_SECS_BW_SUM_INTERVAL. XXXX */ - start += s_interval; + * is not the same as NUM_SECS_BW_SUM_INTERVAL. XXXX */ + start += actual_interval_len; } } SMARTLIST_FOREACH_END(cp); }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit 7c83d4043d7f336c14a53418ce91b12335626f6b Merge: 4a7f979 3f7f96d Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 15:39:04 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug2704_part1 | 5 +++++ changes/bug2704_part2 | 5 +++++ src/or/rephist.c | 21 +++++++++++++++++---- 3 files changed, 27 insertions(+), 4 deletions(-)

1 0

[tor/master] Don't sometimes undercount bw average
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit 13c3884ff60aa0e58464f379f988683f1c30438a Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Tue Apr 19 17:12:27 2011 +0200 Don't sometimes undercount bw average This fixes the first part of bug 2704. It should occur only rarely when no bw maxima are known. Bugfix on 0.2.2.23-alpha. Fixes bug 2704. --- changes/bug2704_part1 | 5 +++++ src/or/rephist.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug2704_part1 b/changes/bug2704_part1 new file mode 100644 index 0000000..eaf2281 --- /dev/null +++ b/changes/bug2704_part1 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix an issue causing calculation of Tor's average bandwidth as saved + in the state file to be 10 times smaller than it should be. Fixes the + first part of bug 2704, bugfix on tor-0.2.2.23-alpha. + diff --git a/src/or/rephist.c b/src/or/rephist.c index 9b7eefe..6034bbc 100644 --- a/src/or/rephist.c +++ b/src/or/rephist.c @@ -1673,7 +1673,7 @@ rep_hist_load_bwhist_state_section(bw_array_t *b, mv *= NUM_SECS_ROLLING_MEASURE; } else { /* No maxima known; guess average rate to be conservative. */ - mv = v / s_interval; + mv = (v / s_interval) * NUM_SECS_ROLLING_MEASURE; } if (!ok) { retval = -1;

1 0

[tor/maint-0.2.2] Don't sometimes undercount bw average
by nickm＠torproject.org 19 Apr '11

19 Apr '11

1 0

[tor/maint-0.2.2] Prevent hugely inflated observed bandwidth values
by nickm＠torproject.org 19 Apr '11

19 Apr '11

1 0

[metrics-tasks/master] Add code to generate the #1991 graphs.
by karsten＠torproject.org 19 Apr '11

19 Apr '11

commit 66474d34ad189d7ab6e6f0ad6359452bbed77e89 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Apr 19 21:21:05 2011 +0200 Add code to generate the #1991 graphs. --- task-1991/.gitignore | 6 ++ task-1991/Aggregate.java | 131 ++++++++++++++++++++++++++++ task-1991/Merge.java | 104 ++++++++++++++++++++++ task-1991/README | 46 ++++++++++ task-1991/torperf-guard-bandwidths-ranks.R | 40 +++++++++ task-1991/torperf-guard-quantiles.R | 57 ++++++++++++ 6 files changed, 384 insertions(+), 0 deletions(-) diff --git a/task-1991/.gitignore b/task-1991/.gitignore new file mode 100644 index 0000000..a0fc089 --- /dev/null +++ b/task-1991/.gitignore @@ -0,0 +1,6 @@ +*.mergedata +*.class +*.png +*.csv +Rplots.pdf + diff --git a/task-1991/Aggregate.java b/task-1991/Aggregate.java new file mode 100644 index 0000000..682a553 --- /dev/null +++ b/task-1991/Aggregate.java @@ -0,0 +1,131 @@ +import java.io.*; +import java.util.*; + +public class Aggregate { + public static void main(String[] args) throws Exception { + BufferedReader br = new BufferedReader(new FileReader( + "torperf-guard-bandwidths-ranks.csv")); + String line = br.readLine(); + List<String> sortedByBandwidth = new ArrayList<String>(), + sortedByRank = new ArrayList<String>(); + while ((line = br.readLine()) != null) { + sortedByBandwidth.add(line); + sortedByRank.add(line); + } + br.close(); + Collections.sort(sortedByBandwidth, new Comparator<String>() { + public int compare(String a, String b) { + return Integer.parseInt(a.split(",")[0]) - + Integer.parseInt(b.split(",")[0]); + } + }); + Collections.sort(sortedByRank, new Comparator<String>() { + public int compare(String a, String b) { + return (int) (100.0 * (Double.parseDouble(a.split(",")[1]) - + Double.parseDouble(b.split(",")[1]))); + } + }); + + List<Integer> percentiles = new ArrayList<Integer>(); + for (int percentile = 1; percentile < 100; percentile += 1) { + percentiles.add(percentile); + } + + BufferedWriter bw = new BufferedWriter(new FileWriter( + "torperf-guard-rank-quantiles.csv")); + bw.write("filesize,rank"); + for (int percentile : percentiles) { + bw.write(",p" + percentile); + } + bw.write(",len\n"); + for (String filesize : Arrays.asList("50kb,1mb,5mb".split(","))) { + double rankPercentInterval = 0.02; + double rankPercent = rankPercentInterval; + List<Integer> times = new ArrayList<Integer>(); + for (int i = 0; i <= sortedByRank.size(); i++) { + double rank = -1.0; + int completionTime = -1; + if (i < sortedByRank.size()) { + String[] parts = sortedByRank.get(i).split(","); + rank = Double.parseDouble(parts[1]); + completionTime = Integer.parseInt(parts[2]); + if (!parts[4].equals(filesize)) { + continue; + } + } + if (i == sortedByRank.size() || rank > rankPercent) { + String rankString = String.format("%.3f", + rankPercent - 0.5 * rankPercentInterval); + bw.write(filesize + "," + rankString); + if (times.size() > 1) { + Collections.sort(times); + for (int percentile : percentiles) { + bw.write("," + times.get(times.size() * percentile / 100)); + } + } else { + for (int percentile : percentiles) { + bw.write(",NA"); + } + } + bw.write("," + times.size() + "\n"); + times.clear(); + rankPercent += rankPercentInterval; + } + if (i == sortedByRank.size()) { + break; + } + times.add(completionTime); + } + } + bw.close(); + + bw = new BufferedWriter(new FileWriter( + "torperf-guard-bandwidth-quantiles.csv")); + bw.write("filesize,bandwidth"); + for (int percentile : percentiles) { + bw.write(",p" + percentile); + } + bw.write(",len\n"); + for (String filesize : Arrays.asList("50kb,1mb,5mb".split(","))) { + int bandwidthInterval = 2500; + int curBandwidth = bandwidthInterval; + List<Integer> times = new ArrayList<Integer>(); + for (int i = 0; i <= sortedByBandwidth.size(); i++) { + int bandwidth = -1; + int completionTime = -1; + if (i < sortedByBandwidth.size()) { + String[] parts = sortedByBandwidth.get(i).split(","); + bandwidth = Integer.parseInt(parts[0]); + completionTime = Integer.parseInt(parts[2]); + if (!parts[4].equals(filesize)) { + continue; + } + } + if (i == sortedByBandwidth.size() || bandwidth > curBandwidth) { + String bandwidthString = String.format("%d", + curBandwidth - (bandwidthInterval / 2)); + bw.write(filesize + "," + bandwidthString); + if (times.size() > 1) { + Collections.sort(times); + for (int percentile : percentiles) { + bw.write("," + times.get(times.size() * percentile / 100)); + } + } else { + for (int percentile : percentiles) { + bw.write(",NA"); + } + } + bw.write("," + times.size() + "\n"); + times.clear(); + curBandwidth += bandwidthInterval; + } + if (i == sortedByBandwidth.size()) { + break; + } + times.add(completionTime); + } + } + bw.close(); + } +} + diff --git a/task-1991/Merge.java b/task-1991/Merge.java new file mode 100644 index 0000000..622cbf6 --- /dev/null +++ b/task-1991/Merge.java @@ -0,0 +1,104 @@ +import java.io.*; +import java.text.*; +import java.util.*; + +public class Merge { + public static void main(String[] args) throws Exception { + + System.out.println("Reading guard node bandwidths..."); + SortedMap<String, String> bandwidthRanks = + new TreeMap<String, String>(); + BufferedReader br = new BufferedReader(new FileReader( + "bandwidths-sql.csv")); + String line = br.readLine(), lastDateTime = null; + List<String> currentRelays = new ArrayList<String>(); + while ((line = br.readLine()) != null) { + if (line.startsWith("fingerprint") || line.startsWith("(")) { + continue; + } + String[] parts = line.split(","); + String fingerprint = parts[0], dateTime = parts[1], + bandwidth = parts[2]; + if (lastDateTime != null && !dateTime.equals(lastDateTime)) { + Collections.sort(currentRelays, new Comparator<String>() { + public int compare(String a, String b) { + return Integer.parseInt(a.split(",")[2]) - + Integer.parseInt(b.split(",")[2]); + } + }); + for (int i = 0; i < currentRelays.size(); i++) { + String relay = currentRelays.get(i); + String relayParts[] = currentRelays.get(i).split(","); + String relayFingerprint = relayParts[0]; + String relayBandwidth = relayParts[2]; + bandwidthRanks.put(relayFingerprint + "," + lastDateTime, + String.format("%s,%.6f", relayBandwidth, (double) i / + (double) (currentRelays.size() - 1))); + } + currentRelays.clear(); + } + lastDateTime = dateTime; + currentRelays.add(line); + } + br.close(); + + System.out.println("Reading .mergedata file and writing completion " + + "time, guard bandwidth, and rank to disk..."); + SortedMap<Integer, List<Long>> aggregatedResults = + new TreeMap<Integer, List<Long>>(); + BufferedWriter bw = new BufferedWriter(new FileWriter( + "torperf-guard-bandwidths-ranks.csv")); + bw.write("bandwidth,rank,completiontime,guards,filesize\n"); + SimpleDateFormat dateTimeFormat = + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + dateTimeFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + for (File mergedataFile : new File(".").listFiles()) { + String filename = mergedataFile.getName(); + if (!filename.endsWith(".mergedata")) { + continue; + } + String guards = filename.substring(0, filename.indexOf("80cbt")); + String filesize = filename.split("-")[1].split("\\.")[0]; + br = new BufferedReader(new FileReader(mergedataFile)); + while ((line = br.readLine()) != null) { + String path = null; + long started = 0L, completed = 0L; + for (String part : line.split(" ")) { + String key = part.substring(0, part.indexOf("=")); + String value = part.substring(part.indexOf("=") + 1); + if (key.equals("PATH")) { + path = value; + } else if (key.equals("STARTSEC")) { + started += Long.parseLong(value) * 1000L; + } else if (key.equals("STARTUSEC")) { + started += Long.parseLong(value) / 1000L; + } else if (key.equals("DATACOMPLETESEC")) { + completed += Long.parseLong(value) * 1000L; + } else if (key.equals("DATACOMPLETEUSEC")) { + completed += Long.parseLong(value) / 1000L; + } else if (key.equals("DIDTIMEOUT")) { + if (value.equals("1")) { + continue; + } + } + } + if (path == null || started == 0L || completed == 0L) { + continue; + } + String dateTime = dateTimeFormat.format(started); + String fingerprint = path.split(",")[0].substring(1).toLowerCase(); + String guardKey = fingerprint + "," + dateTime; + String previousGuardKey = bandwidthRanks.headMap(guardKey).lastKey(); + if (previousGuardKey.startsWith(fingerprint)) { + String bandwidthRank = bandwidthRanks.get(previousGuardKey); + long completionTime = completed - started; + bw.write(bandwidthRank + "," + completionTime + "," + guards + + "," + filesize + "\n"); + } + } + } + br.close(); + bw.close(); + } +} + diff --git a/task-1991/README b/task-1991/README new file mode 100644 index 0000000..8cf5548 --- /dev/null +++ b/task-1991/README @@ -0,0 +1,46 @@ +Visualize influence of guard bandwidth on Torperf completion time + + - Generate one or more .mergedata files, e.g., + + $ ./consolidate_stats.py 50kb.data 50kb.extradata + regular80cbt-50kb.mergedata + + - Extract consensus bandwidths of all relays and write them to a CSV + file. The easiest way to do this is to run an SQL query on the metrics + database: + + => \f ',' + => \a + => \t + => \o bandwidths-sql.csv + => SELECT fingerprint, validafter, bandwidth FROM statusentry + WHERE validafter >= '2011-02-23' ORDER BY validafter, fingerprint; + => \o + => \t + => \a + + - Merge the .mergedata file with the consensus bandwidth file to have a + single CSV file that contains Torperf completion times and Guard node + consensus bandwidths and ranks: + + $ javac Merge.java && java -Xmx2048m Merge + + The result is a file torperf-guard-bandwidths-ranks.csv. + + - Aggregate the results to obtain percentiles: + + $ javac Aggregate.java && java Aggregate + + The result are two files torperf-guard-bandwidth-quantiles.csv and + torperf-guard-rank-quantiles.csv. + + - Plot Torperf results by guard consensus bandwidth and ranks for each + guard selection strategy separately: + + $ R --slave -f torperf-guard-bandwidths-ranks.R + + - Plot Torperf results by guard consensus bandwidth and ranks for all + guard selection strategies and including quantile lines: + + $ R --slave -f torperf-guard-quantiles.R + diff --git a/task-1991/torperf-guard-bandwidths-ranks.R b/task-1991/torperf-guard-bandwidths-ranks.R new file mode 100644 index 0000000..8e7eb0a --- /dev/null +++ b/task-1991/torperf-guard-bandwidths-ranks.R @@ -0,0 +1,40 @@ +library(ggplot2) + +# Read data +data <- read.csv("torperf-guard-bandwidths-ranks.csv", + stringsAsFactors = FALSE) + +data <- data[(data$filesize == "50kb" & data$completiontime < 60000) | + (data$filesize == "1mb" & data$completiontime < 120000) | + (data$filesize == "5mb" & data$completiontime < 300000), ] + +data[data$guards == "slow", "guards"] <- "a) slowest overall" +data[data$guards == "slowratio", "guards"] <- "b) slowest ratio" +data[data$guards == "regular", "guards"] <- "c) default" +data[data$guards == "fastratio", "guards"] <- "d) fastest ratio" +data[data$guards == "fast", "guards"] <- "e) fastest overall" +data[data$filesize == "50kb", "filesize"] <- "a) 50 KB" +data[data$filesize == "1mb", "filesize"] <- "b) 1 MB" +data[data$filesize == "5mb", "filesize"] <- "c) 5 MB" + +ggplot(data, aes(x = bandwidth / 1000, y = completiontime / 1000)) + +geom_point(alpha = 0.05) + +scale_x_continuous("\nGuard consensus bandwidth in MB/s") + +scale_y_continuous("Torperf completion time in seconds\n") + +facet_grid(filesize ~ guards, scale = "free_y") + +opts(legend.position = "none") +ggsave(filename = "torperf-guard-bandwidths.png", + width = 8, height = 5, dpi = 150) + +ggplot(data, aes(x = as.numeric(rank), y = completiontime / 1000)) + +geom_point(alpha = 0.05) + +scale_x_continuous(paste("\nGuard rank by consensus bandwidth from", + "slowest (0) to fastest (1)"), limits = c(0, 1), + breaks = c(0.25, 0.5, 0.75)) + +scale_y_continuous("Torperf completion time in seconds\n") + +facet_grid(filesize ~ guards, scale = "free_y") + +opts(legend.position = "none") +ggsave(filename = "torperf-guard-ranks.png", + width = 8, height = 5, dpi = 150) + + diff --git a/task-1991/torperf-guard-quantiles.R b/task-1991/torperf-guard-quantiles.R new file mode 100644 index 0000000..2554c34 --- /dev/null +++ b/task-1991/torperf-guard-quantiles.R @@ -0,0 +1,57 @@ +library(ggplot2) + +# Read data +data <- read.csv("torperf-guard-bandwidths-ranks.csv", + stringsAsFactors = FALSE) +data <- data[(data$filesize == "50kb" & data$completiontime < 60000) | + (data$filesize == "1mb" & data$completiontime < 600000) | + (data$filesize == "5mb" & data$completiontime < 1500000), ] +data[data$filesize == "50kb", "filesize"] <- "a) 50 KB" +data[data$filesize == "1mb", "filesize"] <- "b) 1 MB" +data[data$filesize == "5mb", "filesize"] <- "c) 5 MB" + +percentiles <- paste("p", seq(90, 90, 1), sep = "") + +rq <- read.csv("torperf-guard-rank-quantiles.csv", + stringsAsFactors = FALSE) +rq[(rq$len < 30 & rq$filesize == "50kb") | + (rq$len < 10 & rq$filesize == "1mb") | + (rq$len < 5 & rq$filesize == "5mb"), percentiles] <- NA +rq <- rq[, c("filesize", "rank", percentiles)] +rq <- melt(rq, id = c("filesize", "rank")) +rq[rq$filesize == "50kb", "filesize"] <- "a) 50 KB" +rq[rq$filesize == "1mb", "filesize"] <- "b) 1 MB" +rq[rq$filesize == "5mb", "filesize"] <- "c) 5 MB" +ggplot(data, aes(x = as.numeric(rank), y = completiontime / 1000)) + +geom_point(alpha = 0.05) + +scale_x_continuous(paste("\nGuard rank by consensus bandwidth from", + "slowest (0) to fastest (1)"), limits = c(0, 1)) + +scale_y_continuous("Torperf completion time in seconds\n") + +geom_line(data = rq, aes(x = as.numeric(rank), y = value / 1000, + colour = variable)) + +facet_grid(filesize ~ ., scale = "free_y") + +opts(legend.position = "none") +ggsave(filename = "torperf-guard-rank-quantiles.png", + width = 8, height = 5, dpi = 150) + +bq <- read.csv("torperf-guard-bandwidth-quantiles.csv", + stringsAsFactors = FALSE) +bq[(bq$len < 30 & bq$filesize == "50kb") | + (bq$len < 10 & bq$filesize == "1mb") | + (bq$len < 5 & bq$filesize == "5mb"), percentiles] <- NA +bq <- bq[, c("filesize", "bandwidth", percentiles)] +bq <- melt(bq, id = c("filesize", "bandwidth")) +bq[bq$filesize == "50kb", "filesize"] <- "a) 50 KB" +bq[bq$filesize == "1mb", "filesize"] <- "b) 1 MB" +bq[bq$filesize == "5mb", "filesize"] <- "c) 5 MB" +ggplot(data, aes(x = bandwidth / 1000, y = completiontime / 1000)) + +geom_point(alpha = 0.05) + +scale_x_continuous("\nGuard consensus bandwidth in MB/s") + +scale_y_continuous("Torperf completion time in seconds\n") + +geom_line(data = bq, aes(x = bandwidth / 1000, y = value / 1000, + colour = variable)) + +facet_grid(filesize ~ ., scale = "free_y") + +opts(legend.position = "none") +ggsave(filename = "torperf-guard-bandwidth-quantiles.png", + width = 8, height = 5, dpi = 150) +

1 0

[tor/master] Standardize our printf code on %d, not %i.
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit 5cc322e5472996fda6095e54de302c0f5c68ea92 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:40:26 2011 -0400 Standardize our printf code on %d, not %i. --- src/common/address.c | 2 +- src/or/routerparse.c | 4 ++-- src/test/test_addr.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index adc0ef0..aff517c 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -604,7 +604,7 @@ tor_addr_parse_mask_ports(const char *s, tor_addr_t *addr_out, if (family == AF_INET6 && v4map) { if (bits > 32 && bits < 96) { /* Crazy */ log_warn(LD_GENERAL, - "Bad mask bits %i for V4-mapped V6 address; rejecting.", + "Bad mask bits %d for V4-mapped V6 address; rejecting.", bits); goto err; } diff --git a/src/or/routerparse.c b/src/or/routerparse.c index dd72eb6..ba29f05 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -4641,8 +4641,8 @@ rend_parse_v2_service_descriptor(rend_service_descriptor_t **parsed_out, if (eos-desc > REND_DESC_MAX_SIZE) { /* XXX023 If we are parsing this descriptor as a server, this * should be a protocol warning. */ - log_warn(LD_REND, "Descriptor length is %i which exceeds " - "maximum rendezvous descriptor size of %i bytes.", + log_warn(LD_REND, "Descriptor length is %d which exceeds " + "maximum rendezvous descriptor size of %d bytes.", (int)(eos-desc), REND_DESC_MAX_SIZE); goto err; } diff --git a/src/test/test_addr.c b/src/test/test_addr.c index 20ffaa0..6db4ee2 100644 --- a/src/test/test_addr.c +++ b/src/test/test_addr.c @@ -477,9 +477,9 @@ test_addr_ip6_helpers(void) i = get_interface_address6(LOG_DEBUG, AF_INET6, &t2); #if 0 tor_inet_ntop(AF_INET, &t1.sa.sin_addr, buf, sizeof(buf)); - printf("\nv4 address: %s (family=%i)", buf, IN_FAMILY(&t1)); + printf("\nv4 address: %s (family=%d)", buf, IN_FAMILY(&t1)); tor_inet_ntop(AF_INET6, &t2.sa6.sin6_addr, buf, sizeof(buf)); - printf("\nv6 address: %s (family=%i)", buf, IN_FAMILY(&t2)); + printf("\nv6 address: %s (family=%d)", buf, IN_FAMILY(&t2)); #endif done:

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 19 Apr '11

19 Apr '11

commit 4a7f979b54c1400190e037b818a241b92e40aabd Merge: 9eeb902 5cc322e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 19 12:41:01 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/address.c | 2 +- src/or/routerparse.c | 4 ++-- src/test/test_addr.c | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits