summaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
AgeCommit message (Collapse)Author
2011-09-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/dirserv.c src/or/networkstatus.c Conflicts were related to routerinfo->node shift.
2011-09-07Merge remote-tracking branch 'public/bug2649_squashed' into maint-0.2.2Nick Mathewson
2011-07-01Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-07-01Use strlcpy when copying node IDs into measured_bw_line_tNick Mathewson
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.
2011-06-14Make the get_options() return constNick Mathewson
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!
2011-06-03Add a VoteOnHidServDirectoriesV2 configuration optionRobert Ransom
2011-06-02Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/dirserv.c
2011-06-02Fix unit test failure in dir/formatsSebastian Hahn
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.
2011-05-30Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
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
2011-05-15Log descriptions of nodes, not just nicknames.Nick Mathewson
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.
2011-05-13Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/config.c src/or/dirserv.c src/or/or.h
2011-05-13Advertise correct DirPort/ORPort when configured with "auto"Nick Mathewson
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.
2011-05-11Merge remote-tracking branch 'public/bug3122_memcmp_022' into bug3122_memcmp_023Nick Mathewson
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
2011-05-11Hand-tune the new tor_memcmp instances in 0.2.2Nick Mathewson
2011-05-11Re-apply the automated conversion to 0.2.2 to make handle any memcmps that ↵Nick Mathewson
snuck in
2011-05-11Merge remote-tracking branch 'public/3122_memcmp_squashed' into ↵Nick Mathewson
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
2011-05-11Hand-conversion and audit phase of memcmp transitionNick Mathewson
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.
2011-05-11Automated conversion of memcmp to tor_memcmp/tor_mem[n]eqNick Mathewson
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
2011-05-05Replace _AUTHORITY enum values with _DIRINFO values (automted)Nick Mathewson
2011-05-05Automated rename from authority_type_t to dirinfo_type_tNick Mathewson
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."
2011-05-04Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-05-04Handle crypto_pk_get_digest failures semi-sensiblyRobert Ransom
Fixes bug 3106.
2011-04-28Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
2011-04-28Clarify comment to say which version fixed 2722Nick Mathewson
2011-04-18Add an XXX to the DA code regarding bug 2722Robert Ransom
2011-04-07Merge remote-tracking branch 'origin/maint-0.2.2'Nick Mathewson
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
2011-03-25Triage the XXX022 and XXX021 comments remaining in the codeNick Mathewson
Remove some, postpone others, leave some alone. Now the only remaining XXX022s are ones that seem important to fix or investigate.
2011-03-14Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Fix trivial add/add conflict in main.c Conflicts: src/or/main.c
2011-03-14Merge remote branch 'arma/bug2716' into maint-0.2.2Nick Mathewson
2011-03-13fix one more typoRoger Dingledine
2011-03-12Tweak bug2716 patch a littleNick Mathewson
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. ;)
2011-03-11Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-11improve accuracy for when a relay went unreachableRoger Dingledine
2011-03-11Use observed instead of declared uptime for HSDirSebastian Hahn
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.
2011-03-08Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Resolved trivial one-line conflicts. Conflicts: src/or/dirserv.c src/or/rephist.c
2011-03-08Merge remote branch 'sebastian/bug1035' into maint-0.2.2Nick Mathewson
2011-03-06Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Conflicts: src/or/routerparse.c
2011-03-06Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-04Do not serve encrypt-only descriptors with the "all" request. Reported by ↵Nick Mathewson
piebeer
2011-02-08Routers count as down when they change ORPort, tooSebastian Hahn
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).
2011-01-03Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-01-03Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
Conflicts: src/common/test.h src/or/test.c
2011-01-03Bump copyright statements to 2011Nick Mathewson
2010-12-07Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-07Merge branch 'bug2081_followup_022' into maint-0.2.2Nick Mathewson
2010-12-07Reject relay versions older than 0.2.0.26-rcNick Mathewson
This was the first version to cache the correct directory information. Fixes bug 2156.
2010-12-06Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2010-12-06Add a missing ! to directory_fetches_from_authoritiesNick Mathewson
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.
2010-12-01Merge remote branch 'sjmurdoch/cloexec'Nick Mathewson
2010-11-30fix memory leak introduced in 26e89742Roger Dingledine
found via valgrind