aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
AgeCommit message (Collapse)Author
2011-07-11Merge remote-tracking branch 'public/bug2841'Nick Mathewson
Conflicts: src/or/config.c
2011-06-28Trivial code tweaks and documentation updates.George Kadianakis
2011-06-14Merge remote-tracking branch 'rransom-tor/bug3349'Nick Mathewson
2011-06-14Make the get_options() return constNick Mathewson
This lets us make a lot of other stuff const, allows the compiler to generate (slightly) better code, and will make me get slightly fewer patches from folks who stick mutable stuff into or_options_t. const: because not every input is an output!
2011-06-14Our warning now is much more specific, mentioning proxy type/addr/port.George Kadianakis
Not included in the previous commit, because the implementation is ugly; I see no other way of doing this though.
2011-06-14We now warn the user if a proxy server is not up when we try to connect with it.George Kadianakis
2011-06-05Report SIGNAL event to controllers when acting on delayed NEWNYMRobert Ransom
Fixes bug 3349.
2011-06-02Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/rendclient.c
2011-06-02Refactor HS client state-clearing code into a separate functionRobert Ransom
2011-06-02Clear last_hid_serv_requests on SIGNAL NEWNYMRobert Ransom
Fixes bug #3309.
2011-06-01Unbreak the buildRobert Ransom
2011-05-30Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/common/compat.c src/or/main.c
2011-05-30Merge remote-tracking branch 'public/bug3270' into maint-0.2.2Nick Mathewson
2011-05-29Merge branch 'maint-0.2.2'Roger Dingledine
2011-05-29answer an XXX nickm asked in aa950e6c4Roger Dingledine
2011-05-23Use a 64-bit type to hold sockets on win64.Nick Mathewson
On win64, sockets are of type UINT_PTR; on win32 they're u_int; elsewhere they're int. The correct windows way to check a socket for being set is to compare it with INVALID_SOCKET; elsewhere you see if it is negative. On Libevent 2, all callbacks take sockets as evutil_socket_t; we've been passing them int. This patch should fix compilation and correctness when built for 64-bit windows. Fixes bug 3270.
2011-05-20Merge branch 'maint-0.2.2'Roger Dingledine
2011-05-19log the reason for publishing a new relay descriptorRoger Dingledine
now we have a better chance of hunting down the root cause of bug 1810.
2011-05-17Merge branch 'maint-0.2.2'Roger Dingledine
2011-05-17refetch bridge descriptors in a timely fashionRoger Dingledine
When we configure a new bridge via the controller, don't wait up to ten seconds before trying to fetch its descriptor. This wasn't so bad when you listed your bridges in torrc, but it's dreadful if you configure your bridges via vidalia.
2011-05-15Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/connection_edge.c
2011-05-13Don't clear out transient addressmap entries on HUPNick Mathewson
If you really want to purge the client DNS cache, the TrackHostExits mappings, and the virtual address mappings, you should be using NEWNYM instead. Fixes bug 1345; bugfix on Tor 0.1.0.1-rc. Note that this needs more work: now that we aren't nuking the transient addressmap entries on HUP, we need to make sure that configuration changes to VirtualAddressMap and TrackHostExits actually have a reasonable effect.
2011-05-13Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/config.c src/or/dirserv.c src/or/or.h
2011-05-13Write automatically-chosen control ports to a file.Nick Mathewson
2011-05-05Move dummy authority.z fetch out of update_router_descriptor_downloadsNick Mathewson
To make sure that a server learns if its IP has changed, the server sometimes launches authority.z descriptor fetches from update_router_descriptor_downloads. That's nice, but we're moving towards a situation where update_router_descriptor_downloads doesn't always get called. So this patch breaks the authority.z check-and-fetch into a new function. This function also renames last_routerdesc_download to a more appropriate last_descriptor_download, and adds a new update_all_descriptor_downloads() function. (For now, this is unnecessary, since servers don't actually use microdescriptors. But that could change, or bridges could start using microdescriptors, and then we'll be glad this is refactored nicely.)
2011-05-04Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-05Fix compile warning on windowsSebastian Hahn
2011-05-03Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/main.c src/or/microdesc.c
2011-05-03Change who calls microdesc_cache_rebuild().Nick Mathewson
Previously we ensured that it would get called periodically by doing it from inside the code that added microdescriptors. That won't work though: it would interfere with our code that tried to read microdescs from disk initially. Instead, we should consider rebuilding the cache periodically, and on startup.
2011-04-28Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-28Ignore SIGNAL NEWNYM on relay-only Tor instancesRobert Ransom
2011-04-28Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/rendcommon.h
2011-04-28Merge branch 'bug3k_021' into bug3k_022Sebastian Hahn
Conflicts: src/or/or.h src/or/rendclient.c
2011-04-28Forget all rendezvous client state on SIGNAL NEWNYMRobert Ransom
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-19Merge remote-tracking branch 'asn/heartbeat'Nick Mathewson
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-30Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/common/compat.h src/or/circuitlist.c src/or/circuituse.c src/or/or.h src/or/rephist.c
2011-03-30Use timevals, not time_t, when expiring circuits.Nick Mathewson
We've got millisecond timers now, we might as well use them. This change won't actually make circuits get expiered with microsecond precision, since we only call the expiry functions once per second. Still, it should avoid the situation where we have a circuit get expired too early because of rounding. A couple of the expiry functions now call tor_gettimeofday: this should be cheap since we're only doing it once per second. If it gets to be called more often, though, we should onsider having the current time be an argument again.
2011-03-14Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Fix trivial add/add conflict in main.c Conflicts: src/or/main.c
2011-03-12Tweak bug2716 patch a littleNick Mathewson
Name the magic value "10" rather than re-deriving it. Comment more. Use the pattern that works for periodic timers, not the pattern that doesn't work. ;)
2011-03-11improve accuracy for when a relay went unreachableRoger Dingledine
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-02-22Initial heartbeat subsystem commit.Sebastian Hahn
Sets: * Documentation * Logging domain * Configuration option * Scheduled event * Makefile It also creates status.c and the log_heartbeat() function. All code was written by Sebastian Hahn. Commit message was written by me (George Kadianakis).
2011-02-07change APIs slightly to make #1944 easierRoger Dingledine
2011-02-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-02-03Enable ASLR and permanent DEP for Windows executablesJohn Brooks
Fix for #2358
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).