aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
Commit message (Collapse)AuthorAge
* Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-09-07
|\ | | | | | | | | | | | | | | Conflicts: src/or/dirserv.c src/or/networkstatus.c Conflicts were related to routerinfo->node shift.
| * Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2Nick Mathewson2011-09-07
| |\
| | * Add a VoteOnHidServDirectoriesV2 configuration optionRobert Ransom2011-06-03
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-07-01
|\| |
| * | Use strlcpy when copying node IDs into measured_bw_line_tNick Mathewson2011-07-01
| |/ | | | | | | | | | | | | | | | | | | | | | | | | We were using strncpy before, which isn't our style for stuff like this. This isn't a bug, though: before calling strncpy, we were checking that strlen(src) was indeed == HEX_DIGEST_LEN, which is less than sizeof(dst), so there was no way we could fail to NUL-terminate. Still, strncpy(a,b,sizeof(a)) is an idiom that we ought to squash everyplace. Fixes CID #427.
* | Make the get_options() return constNick Mathewson2011-06-14
| | | | | | | | | | | | | | | | This lets us make a lot of other stuff const, allows the compiler to generate (slightly) better code, and will make me get slightly fewer patches from folks who stick mutable stuff into or_options_t. const: because not every input is an output!
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-06-02
|\| | | | | | | | | Conflicts: src/or/dirserv.c
| * Fix unit test failure in dir/formatsSebastian Hahn2011-06-02
| | | | | | | | | | | | | | options->DirPort is 0 in the unit tests, so router_get_advertised_dir_port() would return 0 so we wouldn't pick a dirport. This isn't what we want for the unit tests. Fixes bug introduced in 95ac3ea5946.
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-30
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | The conflicts were mainly caused by the routerinfo->node transition. Conflicts: src/or/circuitbuild.c src/or/command.c src/or/connection_edge.c src/or/directory.c src/or/dirserv.c src/or/relay.c src/or/rendservice.c src/or/routerlist.c
| * Log descriptions of nodes, not just nicknames.Nick Mathewson2011-05-15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch introduces a few new functions in router.c to produce a more helpful description of a node than its nickame, and then tweaks nearly all log messages taking a nickname as an argument to call these functions instead. There are a few cases where I left the old log messages alone: in these cases, the nickname was that of an authority (whose nicknames are useful and unique), or the message already included an identity and/or an address. I might have missed a couple more too. This is a fix for bug 3045.
* | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-13
|\| | | | | | | | | | | | | Conflicts: src/or/config.c src/or/dirserv.c src/or/or.h
| * Advertise correct DirPort/ORPort when configured with "auto"Nick Mathewson2011-05-13
| | | | | | | | | | | | We'll eventually want to do more work here to make sure that the ports are stable over multiple invocations. Otherwise, turning your node on and off will get you a new DirPort/ORPort needlessly.
* | Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023Nick Mathewson2011-05-11
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts in various places, mainly node-related. Resolved them in favor of HEAD, with copying of tor_mem* operations from bug3122_memcmp_022. src/common/Makefile.am src/or/circuitlist.c src/or/connection_edge.c src/or/directory.c src/or/microdesc.c src/or/networkstatus.c src/or/router.c src/or/routerlist.c src/test/test_util.c
| * Hand-tune the new tor_memcmp instances in 0.2.2Nick Mathewson2011-05-11
| |
| * Re-apply the automated conversion to 0.2.2 to make handle any memcmps that ↵Nick Mathewson2011-05-11
| | | | | | | | snuck in
| * Merge remote-tracking branch 'public/3122_memcmp_squashed' into ↵Nick Mathewson2011-05-11
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug3122_memcmp_022 Conflicts throughout. All resolved in favor of taking HEAD and adding tor_mem* or fast_mem* ops as appropriate. src/common/Makefile.am src/or/circuitbuild.c src/or/directory.c src/or/dirserv.c src/or/dirvote.c src/or/networkstatus.c src/or/rendclient.c src/or/rendservice.c src/or/router.c src/or/routerlist.c src/or/routerparse.c src/or/test.c
| | * Hand-conversion and audit phase of memcmp transitionNick Mathewson2011-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Here I looked at the results of the automated conversion and cleaned them up as follows: If there was a tor_memcmp or tor_memeq that was in fact "safe"[*] I changed it to a fast_memcmp or fast_memeq. Otherwise if there was a tor_memcmp that could turn into a tor_memneq or tor_memeq, I converted it. This wants close attention. [*] I'm erring on the side of caution here, and leaving some things as tor_memcmp that could in my opinion use the data-dependent fast_memcmp variant.
| | * Automated conversion of memcmp to tor_memcmp/tor_mem[n]eqNick Mathewson2011-05-11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit is _exactly_ the result of perl -i -pe 's/\bmemcmp\(/tor_memcmp\(/g' src/*/*.[ch] perl -i -pe 's/\!\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch] perl -i -pe 's/0\s*==\s*tor_memcmp\(/tor_memeq\(/g' src/*/*.[ch] perl -i -pe 's/0\s*!=\s*tor_memcmp\(/tor_memneq\(/g' src/*/*.[ch] git checkout src/common/di_ops.[ch] git checkout src/or/test.c git checkout src/common/test.h
* | | Replace _AUTHORITY enum values with _DIRINFO values (automted)Nick Mathewson2011-05-05
| | |
* | | Automated rename from authority_type_t to dirinfo_type_tNick Mathewson2011-05-05
| | | | | | | | | | | | | | | We were already overloading this type to mean "a directory that can serve us X" in addition to "a directory that is an authority for X."
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-05-04
|\| |
| * | Handle crypto_pk_get_digest failures semi-sensiblyRobert Ransom2011-05-04
| | | | | | | | | | | | Fixes bug 3106.
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-28
|\| |
| * | Clarify comment to say which version fixed 2722Nick Mathewson2011-04-28
| | |
| * | Add an XXX to the DA code regarding bug 2722Robert Ransom2011-04-18
| | |
* | | Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson2011-04-07
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/address.c src/common/compat_libevent.c src/common/memarea.c src/common/util.h src/or/buffers.c src/or/circuitbuild.c src/or/circuituse.c src/or/connection.c src/or/directory.c src/or/networkstatus.c src/or/or.h src/or/routerlist.c
| * | Triage the XXX022 and XXX021 comments remaining in the codeNick Mathewson2011-03-25
| | | | | | | | | | | | | | | Remove some, postpone others, leave some alone. Now the only remaining XXX022s are ones that seem important to fix or investigate.
* | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-14
|\| | | | | | | | | | | | | | | | | | | | Fix trivial add/add conflict in main.c Conflicts: src/or/main.c
| * | Merge remote branch 'arma/bug2716' into maint-0.2.2Nick Mathewson2011-03-14
| |\ \
| | * | fix one more typoRoger Dingledine2011-03-13
| | | |
| | * | Tweak bug2716 patch a littleNick Mathewson2011-03-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Name the magic value "10" rather than re-deriving it. Comment more. Use the pattern that works for periodic timers, not the pattern that doesn't work. ;)
| | * | improve accuracy for when a relay went unreachableRoger Dingledine2011-03-11
| | | |
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-11
|\| | |
| * | | Use observed instead of declared uptime for HSDirSebastian Hahn2011-03-11
| |/ / | | | | | | | | | | | | | | | | | | | | | It is important to verify the uptime claim of a relay instead of just trusting it, otherwise it becomes too easy to blackhole a specific hidden service. rephist already has data available that we can use here. Bugfix on 0.2.0.10-alpha.
* | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-08
|\| | | | | | | | | | | | | | | | | | | | | | | Resolved trivial one-line conflicts. Conflicts: src/or/dirserv.c src/or/rephist.c
| * | Merge remote branch 'sebastian/bug1035' into maint-0.2.2Nick Mathewson2011-03-08
| |\ \
| | * | Routers count as down when they change ORPort, tooSebastian Hahn2011-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rransom noticed that a change of ORPort is just as bad as a change of IP address from a client's perspective, because both mean that the relay is not available to them while the new information hasn't propagated. Change the bug1035 fix accordingly. Also make sure we don't log a bridge's IP address (which might happen when we are the bridge authority).
| | * | Treat routers whose IPs have changed as having been down for MTBF/routerinfoNick Mathewson2010-11-22
| | | | | | | | | | | | | | | | calculation purposes.
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-06
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/or/routerparse.c
| * | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-03-06
| |\ \ \ | | | |/ | | |/|
| | * | Do not serve encrypt-only descriptors with the "all" request. Reported by ↵Nick Mathewson2011-03-04
| | | | | | | | | | | | | | | | piebeer
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\| | |
| * | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-01-03
| |\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/common/test.h src/or/test.c
| | * | Bump copyright statements to 2011Nick Mathewson2011-01-03
| | | |
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-12-07
|\| | |
| * | | Merge branch 'bug2081_followup_022' into maint-0.2.2Nick Mathewson2010-12-07
| |\ \ \
| | * | | Reject relay versions older than 0.2.0.26-rcNick Mathewson2010-12-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was the first version to cache the correct directory information. Fixes bug 2156.
| | * | | Have authorities reject routers running verions susceptible to bug 1038.Nick Mathewson2010-11-22
| | | |/ | | |/|
* | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2010-12-06
|\| | |
| * | | Add a missing ! to directory_fetches_from_authoritiesNick Mathewson2010-12-06
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The old logic would have us fetch from authorities if we were refusing unknown exits and our exit policy was reject*. Instead, we want to fetch from authorities if we're refusing unknown exits and our exit policy is _NOT_ reject*. Fixed by boboper. Fixes more of 2097. Bugfix on 0.2.2.16-alpha.