Nick Mathewson
2ab3389ed6
Merge remote branch 'mikeperry/consensus-bw-weights5-merge'
...
Conflicts:
ChangeLog
2010-02-25 16:22:29 -05:00
Nick Mathewson
6fa8dacb97
Add a tor_asprintf() function, and use it in a couple of places.
...
asprintf() is a GNU extension that some BSDs have picked up: it does a printf
into a newly allocated chunk of RAM.
Our tor_asprintf() differs from standard asprintf() in that:
- Like our other malloc functions, it asserts on OOM.
- It works on windows.
- It always sets its return-field.
2010-02-25 16:09:10 -05:00
Mike Perry
215930a7de
Check snprintf return values in format_networkstatus_vote.
...
Maybe this is what parakeep was complaining about? Really wish he
would stick around more. Playing these guessing games is not fun :(
2010-02-25 11:59:35 -08:00
Mike Perry
50d6960332
Cast our weights down to ints from int64.
...
They are capped to be between 0 and weight_scale (10000) by the code
just before the snprintf.
2010-02-25 11:42:45 -08:00
Mike Perry
00f9a35678
Update dir-spec.txt with begin_dir weights.
2010-02-25 11:42:24 -08:00
Nick Mathewson
8b93dacbcf
Merge remote branch 'sebastian/manpage'
2010-02-25 14:32:22 -05:00
Nick Mathewson
cf886e296c
Merge remote branch 'sebastian/polipo'
2010-02-25 14:31:53 -05:00
Sebastian Hahn
2917c0596c
Restrict PerConnBWRate|Burst to INT32_MAX, update manpage
...
All other bandwidthrate settings are restricted to INT32_MAX, but
this check was forgotten for PerConnBWRate and PerConnBWBurst. Also
update the manpage to reflect the fact that specifying a bandwidth
in terabytes does not make sense, because that value will be too
large.
2010-02-25 12:33:15 +01:00
Mike Perry
0da26162a3
Make unit tests work.
...
Still not sure why they generate an empty consensus document..
Too much frobbing going on there.
2010-02-24 11:17:31 -08:00
Sebastian Hahn
f31db269a0
Update a section of the exit notice file, give it a changelog.
2010-02-23 20:11:07 +01:00
Sebastian Hahn
e3ba1094a0
Fix some urls in the exit notice
...
Patch by Christian Kujau to fix some links in the exit notice file
(the file you'd use for your DirPortFrontPage), as well as making
the file xhtml compatible. Thanks!
2010-02-23 19:55:46 +01:00
Sebastian Hahn
e52353d779
Update polipo build instructions for OS X 10.6
2010-02-23 17:15:47 +01:00
Sebastian Hahn
c8f154e173
Proper NULL checking for hsdesc publication
...
Fix a dereference-then-NULL-check sequence. This bug wasn't triggered
in the wild, but we should fix it anyways in case it ever happens.
Also make sure users get a note about this being a bug when they
see it in their log.
Thanks to ekir for discovering and reporting this bug.
2010-02-23 17:09:02 +01:00
Sebastian Hahn
7681e355ed
Fix another coverity-spotted memleak
2010-02-23 15:05:39 +01:00
Mike Perry
4311318f7d
Update consensus methods in spec.
2010-02-22 18:43:44 -08:00
Mike Perry
b3fde4d309
Add consensus method #defines.
2010-02-22 18:43:13 -08:00
Roger Dingledine
3ae5bee303
bump to 0.2.2.9-alpha-dev
2010-02-22 21:23:06 -05:00
Nick Mathewson
2e159967c9
Mark 160 and 161 as Finished.
2010-02-22 20:52:32 -05:00
Mike Perry
bce0021d96
Add a changelog entry for the bandwidth weightings.
2010-02-22 17:12:48 -08:00
Mike Perry
f4d6315afa
Remove misc unnecessary newlines found by new check.
2010-02-22 16:52:11 -08:00
Mike Perry
21f91dcb50
Patch from karsten to detect unnecessary \n's.
...
Also fix a spacing issue.
2010-02-22 16:52:11 -08:00
Mike Perry
245be159af
Always weight routers by bandwidth.
...
Also always predict that we need a high capacity circuit or internal
circuit.
2010-02-22 16:52:11 -08:00
Mike Perry
5d4f5ef07d
Update specs for weight computation and use.
2010-02-22 16:52:11 -08:00
Mike Perry
87a0430a74
Clearly mark directory footer so we parse the new weight line.
2010-02-22 16:52:11 -08:00
Mike Perry
931e073a4f
Implement bw weighting selection algorithm.
2010-02-22 16:52:11 -08:00
Mike Perry
df1ef2f0f0
Add parsing+verification for bw weight values.
2010-02-22 16:52:11 -08:00
Mike Perry
f9d40649fe
Perform calculation of consensus bandwidth weights.
...
Also add bwweightscale consensus param. Use it as our
fixed-point calculation width.
2010-02-22 16:52:11 -08:00
Mike Perry
95aad71678
Add %lld compat defines.
2010-02-22 16:52:10 -08:00
Roger Dingledine
8ce1cb174d
elevate a changelog entry, and get my mailto out of the man page
2010-02-22 16:19:35 -05:00
Nick Mathewson
295e6557a9
Merge remote branch 'sebastian/coverity'
2010-02-22 12:46:43 -05:00
Nick Mathewson
c084ae145e
Merge remote branch 'sebastian/bug1254'
2010-02-22 12:45:01 -05:00
Nick Mathewson
d35b8dc582
Make expand_filename into a tor_strdup() alias on windows.
...
On Windows, we don't have a notion of ~ meaning "our homedir", so we
were deliberately using an #ifdef to avoid calling expand_filename()
in multiple places. This is silly: The right place to turn a function
into a no-op on a single platform is in the function itself, not in
every single call-site.
2010-02-22 12:42:31 -05:00
Sebastian Hahn
1dfbec482c
Remove some redundant code in options_save_current()
...
get_torrc_fname() does the same thing we did in this code, so let's
replace it.
2010-02-22 12:21:58 +01:00
Sebastian Hahn
d41030436c
Expand homedirs in paths passed to tor-checkkey
...
This is so that coverity stops complaining about using a user-supplied
string with the open() syscall. Let's see if it works.
2010-02-22 12:13:58 +01:00
Sebastian Hahn
f5112fa487
Zero a cipher completely before freeing it
...
We used to only zero the first ptrsize bytes of the cipher. Since
cipher is large enough, we didn't zero too many bytes. Discovered
and fixed by ekir. Fixes bug 1254.
2010-02-22 11:41:39 +01:00
Sebastian Hahn
b65ad83ebe
Break early on unknown extendcircuit purpose
...
Don't continue handling EXTENDCIRCUIT messages when we get an
unknown purpose.
2010-02-22 10:57:11 +01:00
Sebastian Hahn
dcf85eb158
Fix a memory leak, found by coverity
2010-02-22 10:56:54 +01:00
Sebastian Hahn
e391a497ec
Remove some redundand code in control.c
...
Found by coverity
2010-02-22 10:41:46 +01:00
Roger Dingledine
a7e0b2d6d9
Merge commit 'sebastian/osxinstructions'
2010-02-22 04:01:04 -05:00
Sebastian Hahn
eeba8581b2
Update the osx dmg creation instructions
...
Make sure we follow basic whitespace sanity principles, update a
few links
2010-02-22 09:55:43 +01:00
Sebastian Hahn
5aa9610dd6
network-status-version must come first in a vote/consensus
...
Spec conformance issue: The code didn't force the network-status-version
token to be the first token in a v3 vote or consensus.
Problem discovered by Parakeep.
2010-02-22 09:16:26 +01:00
Roger Dingledine
ee8b0893af
we have two faqs for now
2010-02-22 00:41:48 -05:00
Roger Dingledine
9254655924
we deleted AUTHORS, so don't put it in the tarball
2010-02-22 00:38:02 -05:00
Roger Dingledine
eb842c0022
Merge branch 'maint-0.2.1' into new
...
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-02-22 00:24:33 -05:00
Roger Dingledine
5e8c611673
prepare for 0.2.2.9-alpha
2010-02-22 00:20:55 -05:00
Roger Dingledine
5e5bc8724e
put 0.2.1.24 in release notes too
2010-02-21 17:52:52 -05:00
Roger Dingledine
b9696b96da
bump to 0.2.1.24
2010-02-21 17:27:12 -05:00
Roger Dingledine
a8a0542c77
minor fixes in proposal 169
...
still need to finish reading it, but so far so good
2010-02-21 17:20:37 -05:00
Roger Dingledine
603432090d
fix typo and garbage grammar
2010-02-21 17:18:42 -05:00
Nick Mathewson
0eb03bc6dd
Merge remote branch 'public/cbt-status'
...
Conflicts:
ChangeLog
2010-02-20 18:35:19 -05:00