aboutsummaryrefslogtreecommitdiff
path: root/src/or/directory.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-08 16:10:38 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-30 11:55:44 -0500
commit5f0a8dcd2cfcbafc3deb3a6717808b607a459dac (patch)
treecab98ff453a2116811274dd2118e61290aadd514 /src/or/directory.h
parent628b735fe39e13cc37afb567b32d4b006da51c89 (diff)
downloadtor-5f0a8dcd2cfcbafc3deb3a6717808b607a459dac.tar.gz
tor-5f0a8dcd2cfcbafc3deb3a6717808b607a459dac.zip
Initial hacking for proposal 186.
This code handles the new ORPort options, and incidentally makes all remaining port types use the new port configuration systems. There are some rough edges! It doesn't do well in the case where your Address says one thing but you say to Advertise another ORPort. It doesn't handle AllAddrs. It doesn't actually advertise anything besides the first listed advertised IPv4 ORPort and DirPort. It doesn't do port forwarding to them either. It's not tested either, it needs more documentation, and it probably forgets to put the milk back in the refrigerator.
Diffstat (limited to 'src/or/directory.h')
-rw-r--r--src/or/directory.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/directory.h b/src/or/directory.h
index 8c63bb5dfd..5050f700d2 100644
--- a/src/or/directory.h
+++ b/src/or/directory.h
@@ -80,7 +80,7 @@ time_t download_status_increment_failure(download_status_t *dls,
* the optional status code <b>sc</b>. */
#define download_status_failed(dls, sc) \
download_status_increment_failure((dls), (sc), NULL, \
- get_options()->DirPort, time(NULL))
+ get_options()->DirPort!=NULL, time(NULL))
void download_status_reset(download_status_t *dls);
static int download_status_is_ready(download_status_t *dls, time_t now,