Nick Mathewson
ec94d0307e
Merge remote-tracking branch 'linus/bug6363_only-ln'
2012-09-04 18:23:18 -04:00
Linus Nordberg
d34c690e54
Allocate vote_microdesc_hash_t using tor_malloc_zero().
...
In case the struct grows in the future. Shouldn't be too expensive.
2012-09-04 20:19:41 +02:00
Linus Nordberg
8ef395d6a9
Whitespace.
2012-09-04 20:19:40 +02:00
Linus Nordberg
b337aa4c0e
Remove spurious debug log printout.
2012-09-04 19:27:05 +02:00
Linus Nordberg
d6ad00a01f
Clear the ipv6_preferred flag like the others.
...
I'm not entirely sure that this is meningful but I'm pretty sure it's
not harmful. Seems like the logical thing to do.
2012-09-04 12:55:38 -04:00
Linus Nordberg
c76a332887
Fix a comment.
2012-09-04 12:51:08 -04:00
Linus Nordberg
585ef06978
Add tor_addr_port_new().
2012-09-04 12:03:42 -04:00
Linus Nordberg
68901da5a1
Generate microdescriptors with "a" lines.
...
Generate and store all supported microdescriptor formats. Generate
votes with one "m" line for each format. Only "m" lines with version
info matching chosen consensus method will be voted upon.
An optimisation would be to combine "m" lines with identical hashes,
i.e. instead of "m 1,2,3 H1" and "m 4,5 H1", say "m 1,2,3,4,5 H1".
2012-09-04 11:56:34 -04:00
Linus Nordberg
156ffef249
Have directory authorities vote on IPv6 OR ports according to the spec
...
Define new new consensus method 14 adding "a" lines to vote and
consensus documents.
From proposal 186:
As with other data in the vote derived from the descriptor, the
consensus will include whichever set of "a" lines are given by the
most authorities who voted for the descriptor digest that will be
used for the router.
This patch implements this.
2012-09-04 11:52:22 -04:00
Nick Mathewson
05ded76cb6
Merge remote-tracking branch 'arma/bug6759'
2012-09-04 10:18:51 -04:00
Nick Mathewson
3da9a14f1c
Merge remote-tracking branch 'arma/feature6758'
2012-09-04 10:16:15 -04:00
Nick Mathewson
978a2251f3
Merge remote-tracking branch 'arma/feature6760'
2012-09-04 10:14:55 -04:00
Roger Dingledine
0a2fcc55c5
resolve an XXX by agreeing with nickm
2012-09-03 22:15:04 -04:00
Roger Dingledine
81c6db3288
make "Launching %d requests for %d routers" message more useful
...
specifically, specify what sort of routers we're fetching.
2012-09-03 22:10:49 -04:00
Roger Dingledine
3ea37e5faa
quiet "I learned some more directory information" on startup
...
Reserve it for when new directory information arrives in response to
a fetch.
Resolves ticket 6760.
2012-09-03 19:49:44 -04:00
Roger Dingledine
2131cc125b
Don't log about reloading the microdescriptor cache at startup
...
Addresses bug 6759.
2012-09-03 18:50:27 -04:00
Roger Dingledine
e964f81143
omit the first heartbeat message (resolves ticket 6758)
2012-09-03 18:13:35 -04:00
Roger Dingledine
4bd90e20b9
fix whitespace and trivial typo
2012-09-03 02:09:39 -04:00
Nick Mathewson
3363a0d26e
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:39:30 -04:00
Nick Mathewson
a7a4bbff47
Quiet "Set buildtimeout to low val" warnings: make them info
...
Fix for #6251
2012-08-27 16:37:09 -04:00
Nick Mathewson
f40378118c
Merge remote-tracking branch 'mikeperry/bug6647'
2012-08-27 16:23:19 -04:00
Nick Mathewson
b252ffa7cb
Downgrade path-bias warning messages to INFO for now.
...
We've had over two months to fix them, and didn't. Now we need
0.2.3.x stable. Yes, it would be cool to get this working in
0.2.3.x, but not at the expense of delaying every other feature that
_does_ work in 0.2.3.x. We can do a real fix in 0.2.4.
2012-08-27 16:18:35 -04:00
Nick Mathewson
0c5a44ed0a
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:16:27 -04:00
Nick Mathewson
bffe0d3ccc
Merge branch 'bug6710_023' into maint-0.2.3
2012-08-27 16:15:01 -04:00
Nick Mathewson
e232938ec8
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-27 16:09:29 -04:00
Nick Mathewson
443e4ae1ee
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
...
Conflicts:
src/or/policies.c
2012-08-27 16:07:04 -04:00
Nick Mathewson
62d96284f7
Do not assert when comparing a null address/port against a policy
...
This can create a remote crash opportunity for/against directory
authorities.
2012-08-27 12:04:55 -04:00
Nick Mathewson
b7c172c9ec
Disable extending to private/internal addresses by default
...
This is important, since otherwise an attacker can use timing info
to probe the internal network.
Also, add an option (ExtendAllowPrivateAddresses) so that
TestingTorNetwork won't break.
Fix for bug 6710; bugfix on all released versions of Tor.
2012-08-27 11:19:29 -04:00
Nick Mathewson
5898c09c3a
Fix whitespace
2012-08-27 10:53:40 -04:00
Nick Mathewson
7795f42e4b
Merge branch 'bug6524_nm'
2012-08-27 10:33:24 -04:00
Jim Meyering
90d1c85757
build: minimal adjustments to make out-of-tree build work
2012-08-27 10:00:22 -04:00
Nick Mathewson
b3b4f31936
Merge remote-tracking branch 'linus/bug6364'
2012-08-27 09:53:37 -04:00
Nick Mathewson
6f7dbd3d34
Merge remote-tracking branch 'linus/bug6362'
2012-08-27 09:50:22 -04:00
Nick Mathewson
6864a44a4a
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-24 12:51:50 -04:00
Nick Mathewson
ce4add498f
Merge remote-tracking branch 'public/bug6472' into maint-0.2.3
2012-08-24 12:51:02 -04:00
Nick Mathewson
ca09ea0a8b
Make node_assert_ok less duplicatey
...
This comes at the cost of making its failure message a little less
friendly, but since when do assertion failures count as
user-friendly?
2012-08-24 12:48:23 -04:00
Nick Mathewson
03ca9c63c8
Clarify docs on get_configured_bridge_by_*_digest
2012-08-24 12:31:09 -04:00
Mike Perry
e13abda470
Bug 6647: Use correct scale constant and prevent rounding error
...
We were effectively resetting our counts, and the rounding error
leads to incorrect log messages.
2012-08-23 20:28:29 -07:00
Mike Perry
4950618b13
Bug 6475: Demote pathbias log messages for 0.2.3.x
...
Also make a couple of them less scary.
We'll do a separate, additional commit on 0.2.4.x to bump them back
up again.
2012-08-23 20:28:25 -07:00
Mike Perry
880c71304b
Disable path bias accounting if we have no guards.
...
This should eliminate a lot of notices for Directory Authorities and other
situations where circuits built without using guard nodes.
2012-08-23 19:47:08 -07:00
Linus Nordberg
3410a46ebc
Move ipv6_preferred from routerinfo_t to node_t.
...
Move extend_info_from_router() from circuitbuild.c to router.c and
make it static.
Add get_configured_bridge_by_orports_digest() and have
get_configured_bridge_by_routerinfo() and
node_is_a_configured_bridge() use it. We now consider all OR ports of
a bridge when looking for it.
Move node_get_*_orport to nodelist.c.
Fix a cut'n'paste error in header of nodelist.h.
Add node_assert_ok().
Add router_get_all_orports(). It's duplicating code from
node_get_all_orports(). Worth fixing at the cost of complicating the
API slightly?
2012-08-23 22:13:12 +02:00
Nick Mathewson
6d703f8db5
Make the _sha1.i file generation quieter
2012-08-23 13:14:41 -04:00
Linus Nordberg
734b09080f
Fetch IPv6 address from NETINFO "other OR's address" field.
...
The my_apparent_addr is still unused, apart from now being logged in
the "Got good NETINFO cell" info message.
2012-08-21 18:43:36 +02:00
Nick Mathewson
64676d0571
Merge branch 'bug6638'
2012-08-21 11:20:58 -04:00
Nick Mathewson
939d01f0ba
Merge remote-tracking branch 'origin/maint-0.2.3'
2012-08-21 10:36:51 -04:00
Nick Mathewson
991a8acba2
Merge remote-tracking branch 'public/bug6404' into maint-0.2.3
2012-08-21 10:35:40 -04:00
Nick Mathewson
d517233e71
Merge remote-tracking branch 'linus/bug6621'
2012-08-21 10:21:53 -04:00
Nick Mathewson
778d90122c
Avoid spurious warnings in rend_service_introduce
...
There was some code in the "err:" block that would always log a
warning, reporting an "unknown error" if we hadn't set err_msg. But
there were also plenty of "goto err" blocks that did their own
logging, and never set err_msg at all. Now we should only log when
we have an error message to log.
This fixes bug 6638, from no released Tor version.
2012-08-21 10:15:52 -04:00
Linus Nordberg
9216e2819b
Send IPv6 address in NETINFO cells.
...
Closes #6364 .
2012-08-20 17:01:18 +02:00
Linus Nordberg
5671586dc7
Make all relays, not only bridges, capable of advertising an IPv6 OR port.
...
Closes #6362 .
2012-08-19 14:48:22 +02:00
