summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2011-10-07Merge remote-tracking branch 'asn2/bug3656'Nick Mathewson
Conflicts: src/common/util.c src/common/util.h src/or/config.h src/or/main.c src/test/test_util.c
2011-10-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-10-07Avoid running DNS self-tests if we're operating as a bridgewarms0x
2011-10-07Make it compile on Windows™.George Kadianakis
2011-10-07Support multiple transports in a single transport line.George Kadianakis
Support multiple comma-separated transpotrs in a single {Client,Server}TransportPlugin line.
2011-10-03Fix compilation of 3335 and 3825 fixesNick Mathewson
In master, they ran into problems with the edge_conn/entry_conn split.
2011-10-03Merge remote-tracking branch 'rransom-tor/bug3335-v2'Nick Mathewson
Conflicts: src/or/connection_edge.c src/or/rendclient.c
2011-10-03Rephrase the log messages emitted if the TestSocks check is positiveFabian Keil
Previously Tor would always claim to have been given a hostname by the client, while actually only verifying that the client is using SOCKS4A or SOCKS5 with hostnames. Both protocol versions allow IP addresses, too, in which case the log messages were wrong. Fixes #4094.
2011-10-02Remove an HS's last_hid_serv_requests entries when a conn. attempt endsRobert Ransom
2011-10-02Record the HS's address in last_hid_serv_request keysRobert Ransom
2011-10-02Fix comment typoRobert Ransom
2011-10-02Detect and remove unreachable intro pointsRobert Ransom
2011-10-02Clear the timed_out flag when an HS connection attempt endsRobert Ransom
2011-10-02Record intro point timeouts in rend_intro_point_tRobert Ransom
2011-10-02Refetch an HS's desc if we don't have a usable oneRobert Ransom
Previously, we wouldn't refetch an HS's descriptor unless we didn't have one at all. That was equivalent to refetching iff we didn't have a usable one, but the next commit will make us keep some non-usable HS descriptors around in our cache. Code bugfix on the release that introduced the v2 HS directory system, because rend_client_refetch_v2_renddesc's documentation comment should have described what it actually did, not what its behaviour happened to be equivalent to; no behaviour change in this commit.
2011-09-28refill our token buckets 10 times/sec, not 100Roger Dingledine
refilling often is good, but refilling often has unclear side effects on a) cpu load, and b) making sure every cell, ever, is sent out one at a time
2011-09-28Merge branch 'maint-0.2.2'Roger Dingledine
2011-09-28bridges should use create_fast cells for their own circuitsRoger Dingledine
fixes bug 4124, as noticed in bug 4115
2011-09-28Merge branch 'maint-0.2.2'Roger Dingledine
2011-09-28bug 4115: make bridges use begindir for their dir fetchesRoger Dingledine
removes another avenue for enumerating bridges.
2011-09-28Make sure the microdesc cache is loaded before setting a v3 md consensusNick Mathewson
Otherwise, we can wind up munging our reference counts if we set it in the middle of loading the nodes. This happens because nodelist_set_consensus() and microdesc_reload_cache() are both in the business of adjusting microdescriptors' references.
2011-09-28Add some debugging code to microdesc.[ch]Nick Mathewson
2011-09-28Fix a crash bug in tor_assert(md->held_by_node)Nick Mathewson
The fix is to turn held_by_node into a reference count. Fixes bug 4118; bugfix on 0.2.3.1-alpha.
2011-09-27if we have enough usable guards, just pick oneRoger Dingledine
we don't need to check whether we don't have enough guards right after concluding that we do have enough. slight efficiency fix suggested by an anonymous fellow on irc.
2011-09-24Merge branch 'maint-0.2.2'Roger Dingledine
2011-09-24trivial whitespace changes, take twoRoger Dingledine
2011-09-24Trivial whitespace fixesNick Mathewson
2011-09-24Ticket #4063 - change circuit build timeout log entries from NOTICE to INFOTom Lowenthal
2011-09-23Improve wording in some comments and log messages.George Kadianakis
2011-09-22Fix issues in 3630 patch noted by KarstenNick Mathewson
2011-09-22Make bufferevents work with TokenBucketRefillIntervalNick Mathewson
2011-09-22Refactor connection_bucket_refill(_helper) to avoid roundoffNick Mathewson
We were doing "divide bandwidth by 1000, then multiply by msec", but that would lose accuracy: instead of getting your full bandwidth, you'd lose up to 999 bytes per sec. (Not a big deal, but every byte helps.) Instead, do the multiply first, then the division. This can easily overflow a 32-bit value, so make sure to do it as a 64-bit operation.
2011-09-22Move around check for TokenBucketRefillInterval; disallow changes to itNick Mathewson
2011-09-22New torrc option to allow bucket refill intervals of less than 1 secFlorian Tschorsch
Implements bug3630.
2011-09-15Log errno on listener socket creation failure.Nick Mathewson
This may help diagnose bug 4027.
2011-09-13Merge branch 'maint-0.2.2'Roger Dingledine
2011-09-13Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
Conflicts: src/or/main.c src/or/router.c
2011-09-13Generate our ssl session certs with a plausible lifetimeRoger Dingledine
Nobody but Tor uses certs on the wire with 2 hour lifetimes, and it makes us stand out. Resolves ticket 4014.
2011-09-12Put some sense into our logging.George Kadianakis
Transform our logging severities to something more sensible. Remove sneaky printf()s.
2011-09-11Don't warn of stray Bridges if managed proxies are still unconfigured.George Kadianakis
With managed proxies you would always get the error message: "You have a Bridge line using the X pluggable transport, but there doesn't seem to be a corresponding ClientTransportPlugin line." because the check happened directly after parse_client_transport_line() when managed proxies were not fully configured and their transports were not registered. The fix is to move the validation to run_scheduled_events() and make sure that all managed proxies are configured first.
2011-09-11Constification.George Kadianakis
2011-09-11Make check-spaces happy.George Kadianakis
2011-09-11Enforce transport names being C identifiers.George Kadianakis
Introduce string_is_C_identifier() and use it to enforce transport names according to the 180 spec.
2011-09-11Trivial fixes around the code.George Kadianakis
* C90-fy. * Remove ASN comments. * Don't smartlist_clear() before smartlist_free(). * Plug a mem. leak.
2011-09-11Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-09-11Be more defensive in get_transport_bindaddr().George Kadianakis
Make sure that lines in get_transport_bindaddr() begin with the name of the transport and a space.
2011-09-11Fix bug in get_transport_in_state_by_name() when using strcmpstart().George Kadianakis
We now split the state lines into smartlists and compare the token properly. Not that efficient but it's surely correct.
2011-09-11Improve how we access or_state_t.George Kadianakis
* Use get_or_state()->VirtualOption instead of relying on config_find_option(), STRUCT_VAR_P and voodoo.
2011-09-11Remove connection_uses_transport() since it was unused.George Kadianakis
2011-09-11Allow interwined {Client,Server}TransportPlugin lines.George Kadianakis