summaryrefslogtreecommitdiff
path: root/src/or/main.h
AgeCommit message (Collapse)Author
2011-04-26Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/main.h
2011-04-26Expose a new process_signal(uintptr_t), not signal_callback()Nick Mathewson
This is a tweak to the bug2917 fix. Basically, if we want to simulate a signal arriving in the controller, we shouldn't have to pretend that we're Libevent, or depend on how Tor sets up its Libevent callbacks.
2011-04-16Reuse get_bytes_{read,written}() in status.cGeorge Kadianakis
2011-04-15Make SIGNAL DUMP work on FreeBSDSebastian Hahn
While doing so, get rid of the now unnecessary function control_signal_act(). Fixes bug 2917, reported by Robert Ransom. Bugfix on commit 9b4aa8d2abbce71398e58188209a1b1d04885b96. This patch is loosely based on a patch by Robert (Changelog entry).
2011-03-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Trivial Conflicts in src/common/crypto.c src/or/main.h src/or/or.h
2011-03-16Doxygen documentation for about 100 things that didn't have anyNick Mathewson
About 860 doxygen-less things remain in 0.2.2
2011-02-22Implement more heartbeat message stuff.George Kadianakis
(This squashes multiple commits: * Adds uptime monitoring support. * Adds circuit counting code. * Trivially tweaks the documentation. * Trivial run_scheduled_events() code tweaking. * Adds a status.h to export functions. * Added bandwidth monitoring code. * Added consensus presense detection code. * Restricts the precision of the bandwidth output. * Various fixes. * Fixed style and spacing problems. * Tidied up src/or/Makefile.am * Couple of minor fixes on status.c functions. * 'Implemented' client heartbeat support )
2011-01-07GETINFO options for querying traffic usageDamian Johnson
This was originally a patch provided by pipe (http://www.mail-archive.com/or-talk@freehaven.net/msg13085.html) to provide a method for controllers to query the total amount of traffic tor has handled (this is a frequently requested piece of information by relay operators).
2011-01-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-03Bump copyright statements to 2011 (0.2.2)Nick Mathewson
2010-09-27Add bufferevent support for outgoing connections; exits are now supported.Nick Mathewson
2010-09-27Teach read_event/write_event manipulators about bufferevents.Nick Mathewson
Add an --enable-bufferevents config switch.
2010-09-22Rename has_completed_circuit to can_complete_circuitNick Mathewson
Also redocument it. Related to #1362.
2010-07-27Create main.hSebastian Hahn
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion