| Commit message (Expand) | Author | Age |
... | |
* | | | | Merge maint-0.2.2 for the bug1090-part1-squashed branch•••Resolved conflicts in:
doc/tor.1.txt
src/or/circuitbuild.c
src/or/circuituse.c
src/or/connection_edge.c
src/or/connection_edge.h
src/or/directory.c
src/or/rendclient.c
src/or/routerlist.c
src/or/routerlist.h
These were mostly releated to the routerinfo_t->node_t conversion.
| Nick Mathewson | 2011-04-27 |
|\| | | |
|
| * | | | Fix a log msg | Sebastian Hahn | 2011-04-26 |
| * | | | If we're excluded, and StrictNodes is set, do not do self-tests. | Nick Mathewson | 2011-04-26 |
| * | | | three more cases where maybe we want to exclude | Roger Dingledine | 2011-04-26 |
* | | | | Merge remote branch 'origin/maint-0.2.2'•••Fixed conflict: router_get_my_routerinfo now returns const
Conflicts:
src/or/router.c
| Nick Mathewson | 2011-03-14 |
|\| | | |
|
| * | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 | Nick Mathewson | 2011-03-14 |
| |\| | |
|
| | * | | we're not reachable if we don't have a routerinfo yet | Roger Dingledine | 2011-03-13 |
| | |/ |
|
* | | | Merge remote branch 'origin/maint-0.2.2'•••Conflicts:
src/or/policies.c
src/or/policies.h
| Nick Mathewson | 2011-02-22 |
|\| | |
|
| * | | Don't let bad DNS make exit policy and declared exit policy get out of sync•••Patch from "postman" on trac. Fixes bg 2366. Bug on 0.1.2.5-alpha.
| Nick Mathewson | 2011-02-22 |
* | | | Merge remote branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-02-22 |
|\| | |
|
| * | | Don't crash a bridge authority on SIGHUP if it's not in the consensus•••Fixes bug 2572.
| Robert Ransom | 2011-02-16 |
* | | | Merge branch 'maint-0.2.2' | Roger Dingledine | 2011-01-15 |
|\| | |
|
| * | | Sanity-check consensus param values•••We need to make sure that the worst thing that a weird consensus param
can do to us is to break our Tor (and only if the other Tors are
reliably broken in the same way) so that the majority of directory
authorities can't pull any attacks that are worse than the DoS that
they can trigger by simply shutting down.
One of these worse things was the cbtnummodes parameter, which could
lead to heap corruption on some systems if the value was sufficiently
large.
This commit fixes this particular issue and also introduces sanity
checking for all consensus parameters.
| Sebastian Hahn | 2011-01-15 |
* | | | Merge remote branch 'origin/maint-0.2.2' | Nick Mathewson | 2011-01-03 |
|\| | |
|
| * | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2•••Conflicts:
src/common/test.h
src/or/test.c
| Nick Mathewson | 2011-01-03 |
| |\| |
|
| | * | Bump copyright statements to 2011 | Nick Mathewson | 2011-01-03 |
| | * | finally get rid of "clique mode" | Roger Dingledine | 2010-04-23 |
* | | | Make connection direction statistics compile again. | Karsten Loesing | 2010-12-03 |
* | | | Write bidirectional connection stats in single line.•••There's no need to have a separate line conn-stats-end for the end date
and interval length with only a single line conn-bi-direct following.
| Karsten Loesing | 2010-12-03 |
* | | | Call the new config option ConnDirectionStatistics. | Karsten Loesing | 2010-12-03 |
* | | | Add metric on uni/bidirectional connection usage. | Karsten Loesing | 2010-12-03 |
* | | | Merge remote branch 'origin/maint-0.2.2'•••Conflicts:
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
| Nick Mathewson | 2010-11-24 |
|\| | |
|
| * | | Avoid dereferencing NULL if a bridge fails to build an ei descriptor.•••Reported by an anonymous commenter on Trac.
| Robert Ransom | 2010-11-24 |
* | | | found this whitespace fix in a sandbox | Roger Dingledine | 2010-11-21 |
* | | | Merge remote branch 'origin/maint-0.2.2'•••Conflicts:
src/or/router.c
| Nick Mathewson | 2010-11-19 |
|\| | |
|
| | \ | |
| | \ | |
| *-. \ | Merge branch 'fix2183', remote branch 'rransom/fix2195-v2' into maint-0.2.2 | Nick Mathewson | 2010-11-19 |
| |\ \ \ |
|
| | | * | | Fix logic error in router_dump_router_to_string.•••Spotted by Nick Mathewson.
| Robert Ransom | 2010-11-19 |
| | | * | | Generate a router descriptor even if generating an extra-info descriptor fails.•••Fixes bug #2195.
| Robert Ransom | 2010-11-17 |
| | | * | | Do not emit an extra-info-digest descriptor line if the digest is zero. | Robert Ransom | 2010-11-17 |
| | * | | | Add comments to some of the bug2183 fix code | Nick Mathewson | 2010-11-19 |
| | * | | | Tweak the bugfix for 2183 a bit more. | Karsten Loesing | 2010-11-17 |
| | * | | | Don't use log_err for non-criticial warnings. | Karsten Loesing | 2010-11-15 |
| | * | | | Try harder not to exceed the 50 KB extra-info descriptor limit.•••Our checks that we don't exceed the 50 KB size limit of extra-info
descriptors apparently failed. This patch fixes these checks and reserves
another 250 bytes for appending the signature. Fixes bug 2183.
| Karsten Loesing | 2010-11-15 |
| | |/ / |
|
* | | | | Merge remote branch 'origin/maint-0.2.2'•••Conflicts:
src/or/config.c
src/or/cpuworker.c
| Nick Mathewson | 2010-11-15 |
|\| | | |
|
| * | | | Change Natd into NATD in our options.•••Breaking this out of the last commit because this might be more
controversial.
| Sebastian Hahn | 2010-11-10 |
| |/ / |
|
* | | | Add two fixes to the new geoip-db-digest line. | Karsten Loesing | 2010-11-12 |
* | | | Add GeoIP file digest to extra-info descriptor. | Karsten Loesing | 2010-11-09 |
* | | | Merge remote branch 'origin/maint-0.2.2' | Nick Mathewson | 2010-10-26 |
|\| | |
|
| * | | Properly refcount client_identity_key•••In a2bb0bf we started using a separate client identity key. When we are
in "public server mode" (that means not a bridge) we will use the same
key. Reusing the key without doing the proper refcounting leads to a
segfault on cleanup during shutdown. Fix that.
Also introduce an assert that triggers if our refcount falls below 0.
That should never happen.
| Sebastian Hahn | 2010-10-26 |
* | | | Merge remote branch 'origin/maint-0.2.2'•••Conflicts:
src/common/tortls.c
| Nick Mathewson | 2010-10-21 |
|\| | |
|
| * | | Fix a whitespace error | Nick Mathewson | 2010-10-21 |
| * | | Add some asserts to get_{tlsclient|server}_identity_key•••We now require that:
- Only actual servers should ever call get_server_identity_key
- If you're being a client or bridge, the client and server keys should
differ.
- If you're being a public relay, the client and server keys
should be the same.
| Nick Mathewson | 2010-10-21 |
| * | | Rename get_client_identity_key to get_tlsclient_identity_key | Nick Mathewson | 2010-10-21 |
| * | | Maintain separate server and client identity keys when appropriate.•••Fixes a bug described in ticket #988.
| Robert Ransom | 2010-10-04 |
| * | | Maintain separate server and client TLS contexts.•••Fixes bug #988.
| Robert Ransom | 2010-10-04 |
| * | | Refactor tor_tls_context_new:•••* Make tor_tls_context_new internal to tortls.c, and return the new
tor_tls_context_t from it.
* Add a public tor_tls_context_init wrapper function to replace it.
| Robert Ransom | 2010-10-04 |
| * | | Add public_server_mode function. | Robert Ransom | 2010-10-04 |
* | | | Merge branch 'bug1992_part1' | Nick Mathewson | 2010-10-15 |
|\ \ \ |
|
| * | | | refactor all these tor_inet_ntoa idioms•••but don't refactor the ones that look messy
| Roger Dingledine | 2010-10-01 |
| |/ / |
|
* | | | Initial conversion to use node_t throughout our codebase.•••A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
| Nick Mathewson | 2010-10-01 |