Andrea Shepard
283646fd90
Fix scheduler assertion in circuitmux/destroy_cell_queue unit test
2014-09-30 22:49:36 -07:00
Andrea Shepard
63bb9a795e
Fix compiler warning
2014-09-30 22:49:36 -07:00
Andrea Shepard
55907da28d
Sort the scheduler's channel list by cmux comparisons
2014-09-30 22:49:36 -07:00
Andrea Shepard
700d6e7525
Add inter-cmux comparison support to circuitmux_ewma.c
2014-09-30 22:49:35 -07:00
Andrea Shepard
9db596d2ef
Add cmux support for inter-cmux comparisons
2014-09-30 22:49:35 -07:00
Andrea Shepard
1275002a46
Schedule according to a queue size heuristic
2014-09-30 22:49:35 -07:00
Andrea Shepard
4f567c8cc8
Let the new scheduler handle writes
2014-09-30 22:49:03 -07:00
Andrea Shepard
f314d9509c
Fix return values from channel_flush_some_cells() to correctly count cells directly written by channel_flush_from_first_active_circuit()
2014-09-30 22:49:03 -07:00
Andrea Shepard
2fc3da3ff5
Implement global queue size query in channel.c
2014-09-30 22:49:03 -07:00
Andrea Shepard
8852a1794c
Track total queue size per channel, with overhead estimates, and global queue total
2014-09-30 22:49:03 -07:00
Andrea Shepard
7674308f62
Make 'make check-spaces' not complain about function pointers returning size_t or double
2014-09-30 22:49:02 -07:00
Andrea Shepard
5e0a6d54d0
Add global cell/byte counters and per channel byte counters to channel.c
2014-09-30 22:49:02 -07:00
Andrea Shepard
f0533d8d22
Remove no-longer-used channel_tls_t functions
2014-09-30 22:49:02 -07:00
Andrea Shepard
b09f41424c
Actually call channel_flush_some_cells() from the scheduler
2014-09-30 22:49:01 -07:00
Andrea Shepard
2efbab2aaf
Provide generic mechanism for scheduler to query writeable cells on a channel
2014-09-30 22:48:26 -07:00
Nick Mathewson
472b62bfe4
Uglify scheduler init logic to avoid crash on startup.
...
Otherwise, when we authority try to do a self-test because of
init-keys, if that self-test can't be launched for whatever reason and
so we close the channel immediately, we crash.
Yes, this a silly way for initialization to work.
2014-09-30 22:48:26 -07:00
Nick Mathewson
85ee5b3095
Use event_active, not 0-length timeouts. It's idempotent, too.
2014-09-30 22:48:26 -07:00
Nick Mathewson
fc13184e44
Fix unused-arguments warnings
2014-09-30 22:48:26 -07:00
Nick Mathewson
08bea13c35
Temporarily disable scheduler_trigger as unused
2014-09-30 22:48:26 -07:00
Andrea Shepard
d438cf1ec9
Implement scheduler mechanism to track lists of channels wanting cells or writes; doesn't actually drive the cell flow from it yet
2014-09-30 22:48:24 -07:00
Roger Dingledine
1987157d0c
+ is not how we say concatenate
2014-09-22 20:09:03 -04:00
Nick Mathewson
e6150c7fc0
Merge remote-tracking branch 'public/bug12693_025'
2014-09-22 14:45:38 -04:00
Nick Mathewson
2b3822d2da
Merge branch 'master' of git-rw.torproject.org:/tor
2014-09-22 14:35:14 -04:00
Nick Mathewson
bdd0c77643
Merge branch 'bug8197_squashed'
...
Conflicts:
src/test/test_policy.c
2014-09-22 14:34:52 -04:00
Roger Dingledine
00fafe9ab4
and forward-port those changelogs too
2014-09-22 14:21:26 -04:00
rl1987
80622c0664
Writing comments for newly added functions.
2014-09-22 14:18:01 -04:00
rl1987
45fc0612d3
Adding changes file for 8197.
2014-09-22 14:18:01 -04:00
rl1987
2e951f8dda
Whitespace fixes
2014-09-22 14:18:00 -04:00
rl1987
0eaf82947d
Using the new API in unit-test.
2014-09-22 14:18:00 -04:00
rl1987
c735b60e4c
New API for policies_parse_exit_policy().
2014-09-22 14:18:00 -04:00
Nick Mathewson
c8d927bad4
changes file for 12884
2014-09-22 10:55:53 -04:00
Adrien BAK
8858194952
Remove config options that have been obsolete since 0.2.3
2014-09-22 10:55:01 -04:00
Nick Mathewson
6c6ea8c425
Merge remote-tracking branch 'arma/feature13211'
2014-09-22 10:49:10 -04:00
Nick Mathewson
d3382297fe
Merge remote-tracking branch 'arma/feature13153'
2014-09-22 10:42:54 -04:00
Nick Mathewson
01b23a6d49
changes file for 7733
2014-09-22 10:39:51 -04:00
Nick Mathewson
1a1e695800
Merge remote-tracking branch 'public/bug7733a'
2014-09-22 10:38:05 -04:00
Nick Mathewson
bc758e4a5e
Merge remote-tracking branch 'intrigeri/bug13196-systemd-writable-run-directory'
2014-09-22 10:31:24 -04:00
Roger Dingledine
09183dc315
clients use optimistic data when reaching hidden services
...
Allow clients to use optimistic data when connecting to a hidden service,
which should cut out the initial round-trip for client-side programs
including Tor Browser.
(Now that Tor 0.2.2.x is obsolete, all hidden services should support
server-side optimistic data.)
See proposal 181 for details. Implements ticket 13211.
2014-09-21 20:02:12 -04:00
Roger Dingledine
530fac10aa
Use optimistic data even if we don't know exitnode->rs
...
I think we should know the routerstatus for our exit relay, since
we built a circuit to it. So I think this is just a code simplication.
2014-09-21 19:12:20 -04:00
Roger Dingledine
bbfb1aca55
get rid of routerstatus->version_supports_optimistic_data
...
Clients are now willing to send optimistic circuit data (before they
receive a 'connected' cell) to relays of any version. We used to
only do it for relays running 0.2.3.1-alpha or later, but now all
relays are new enough.
Resolves ticket 13153.
2014-09-21 19:04:18 -04:00
Roger Dingledine
4c8b809b96
get rid of trivial redundant comment
2014-09-21 18:56:48 -04:00
Roger Dingledine
1b40ea036f
Stop silently skipping invalid args to setevents
...
Return an error when the second or later arguments of the
"setevents" controller command are invalid events. Previously we
would return success while silently skipping invalid events.
Fixes bug 13205; bugfix on 0.2.3.2-alpha. Reported by "fpxnns".
2014-09-21 16:05:24 -04:00
Roger Dingledine
e170205cd8
Merge branch 'maint-0.2.5'
2014-09-20 16:51:17 -04:00
Roger Dingledine
87576e826f
Merge branch 'maint-0.2.4' into maint-0.2.5
...
Conflicts:
src/or/config.c
2014-09-20 16:50:32 -04:00
Roger Dingledine
288b3ec603
Merge branch 'maint-0.2.3' into maint-0.2.4
2014-09-20 16:49:24 -04:00
Sebastian Hahn
0eec8e2aa5
gabelmoo's IPv4 address changed
2014-09-20 16:46:02 -04:00
intrigeri
2f47ab247a
Add changes file for #13196 .
...
Note that this will likely need to be folded with the changes file for #12751 ,
as this change is a mere fixup on top of the changes introduced for #12751 .
2014-09-19 16:10:39 +00:00
intrigeri
da384090f7
systemd unit file: set up /var/run/tor as writable for the Tor service.
...
For some strange reason, this was not needed with systemd v208.
But it's needed with systemd v215 on current Debian sid, and entirely
makes sense.
2014-09-19 16:10:39 +00:00
Nick Mathewson
6d6e21a239
Merge branch 'bug4244b_squashed'
2014-09-18 15:31:08 -04:00
Roger Dingledine
905443f074
Clients no longer write "DirReqStatistics 0" in their saveconf output
...
Stop modifying the value of our DirReqStatistics torrc option just
because we're not a bridge or relay. This bug was causing Tor
Browser users to write "DirReqStatistics 0" in their torrc files
as if they had chosen to change the config.
Fixes bug 4244; bugfix on 0.2.3.1-alpha.
2014-09-18 15:29:14 -04:00