summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2011-04-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-07Allow controllers a more up-to-date view of bridge usage.Nick Mathewson
Instead of answering GETINFO requests about our geoip usage only after running for 24 hours, this patch makes us answer GETINFO requests immediately. We still round and quantize as before. Implements bug2711. Also, refactor the heck out of the bridge usage formatting code. No longer should we need to do a generate-parse-and-regenerate cycle to get the controller string, and that lets us simplify the code a lot.
2011-04-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-07Fix a compile warning on OS X 10.6Sebastian Hahn
2011-04-06Merge remote-tracking branch 'public/bug2381'Nick Mathewson
2011-04-06Add a missing ! to the check for CountPrivatebandwidth.Nick Mathewson
2011-04-05Tweaks to Cagara's CountPrivateBandwidth patch:Nick Mathewson
- Document it in the manpage - Add a changes entry - No need to log when it is set: we don't log for other options. - Use doxygen to document the new flag. - Test truth of C variables with "if (x)", not "if (x == 1)". - Simplify a complex boolean expression by breaking it up.
2011-04-05Patch from cagara: Add a CountPrivateBandwidth flagDaniel Cagara
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 cbt to tell when to launch parallel intro circuitNick Mathewson
Implement feature from trac #2799
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-18Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Trivial Conflicts: configure.in
2011-03-18Fix signed/unsigned compare warningNick Mathewson
2011-03-18Merge remote branch 'sebastian/bug2696' into maint-0.2.2Nick Mathewson
2011-03-17Futz with the clang patch a bit and tidy some geoip.c stuffNick Mathewson
2011-03-16Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-16Document a few more members.Nick Mathewson
2011-03-16Remove a useless doxygen commentNick Mathewson
2011-03-16Move the decl for tor_gettimofday_cache_clear to the right headerNick Mathewson
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-03-16Fix up all doxygen warnings other than "foo is not documented"Nick Mathewson
2011-03-15Merge remote branch 'arma/optimistic_server'Nick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Merge branch 'bug2756_relay' into maint-0.2.2Nick Mathewson
2011-03-15whitespace fixes to pass 'make check-spaces'Roger Dingledine
2011-03-15Fix comment for connection_edge_consider_sending_sendmeNick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Merge branch 'bug2757' into maint-0.2.2Nick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-15Fix a compile warning when using clangSebastian Hahn
Issue noticed by Steven Murdoch; fixes bug 2689. The cast didn't do anything, and we don't need to look at the return value of the function here.
2011-03-15Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-15Fix a log message typoRobert Ransom
2011-03-15Log the source of a rejected POSTed v3 voteRobert Ransom
Related to ticket 2683.
2011-03-14Check newconn, not conn, before marking newconn for closeNick Mathewson
This fixes bug 2757. It's a bugfix on 85da676108f0d.
2011-03-14Revise prop174 patch: make the circuit sendme calls unconditional.Nick Mathewson
The circuit_consider_sending_sendme call should be unconditional, since the circuit windows can move independent of the state of streams.
2011-03-14Implement server side of Proposal 174 (optimistic data)Ian Goldberg
Ian's original message: The current code actually correctly handles queued data at the Exit; if there is queued data in a EXIT_CONN_STATE_CONNECTING stream, that data will be immediately sent when the connection succeeds. If the connection fails, the data will be correctly ignored and freed. The problem with the current server code is that the server currently drops DATA cells on streams in the EXIT_CONN_STATE_CONNECTING state. Also, if you try to queue data in the EXIT_CONN_STATE_RESOLVING state, bad things happen because streams in that state don't yet have conn->write_event set, and so some existing sanity checks (any stream with queued data is at least potentially writable) are no longer sound. The solution is to simply not drop received DATA cells while in the EXIT_CONN_STATE_CONNECTING state. Also do not send SENDME cells in this state, so that the OP cannot send more than one window's worth of data to be queued at the Exit. Finally, patch the sanity checks so that streams in the EXIT_CONN_STATE_RESOLVING state that have buffered data can pass. [...] Here is a simple patch. It seems to work with both regular streams and hidden services, but there may be other corner cases I'm not aware of. (Do streams used for directory fetches, hidden services, etc. take a different code path?)
2011-03-14Consider sending stream-level SENDME cells on partial flushes.Nick Mathewson
Right now, we only consider sending stream-level SENDME cells when we have completely flushed a connection_edge's outbuf, or when it sends us a DATA cell. Neither of these is ideal for throughput. This patch changes the behavior so we now call connection_edge_consider_sending_sendme when we flush _some_ data from an edge outbuf. Fix for bug 2756; bugfix on svn r152.
2011-03-14clarify log messages based on suggestion from armaNick Mathewson
2011-03-14Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Fixed conflict: router_get_my_routerinfo now returns const Conflicts: src/or/router.c
2011-03-14Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-14finish a commentNick Mathewson
2011-03-14Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Resolved nontrivial conflict around rewrite_x_address_for_bridge and learned_bridge_descriptor. Now, since leanred_bridge_descriptor works on nodes, we must make sure that rewrite_node_address_for_bridge also works on nodes. Conflicts: src/or/circuitbuild.c
2011-03-14Merge remote branch 'arma/bug2510' into maint-0.2.2Nick Mathewson
2011-03-14Merge branch 'bug2511' into bug2510Roger Dingledine
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-14Merge remote branch 'arma/bug2716' into maint-0.2.2Nick Mathewson
2011-03-13fix two issues pointed out by nickmRoger Dingledine
2011-03-13we're not reachable if we don't have a routerinfo yetRoger Dingledine
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion