diff options
author | Roger Dingledine <arma@torproject.org> | 2003-03-18 01:49:55 +0000 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2003-03-18 01:49:55 +0000 |
commit | 64e46988f65176c0a12700e24b7738b26fd2cdd0 (patch) | |
tree | edf4e223dcd1f233aa587cd4317cae5e226ac879 /src/or/routers.c | |
parent | d5c42576a3cde4228ccef6503e92c2a02d8510c0 (diff) | |
download | tor-64e46988f65176c0a12700e24b7738b26fd2cdd0.tar.gz tor-64e46988f65176c0a12700e24b7738b26fd2cdd0.zip |
greatly simplify this notion of 'roles':
if your ORPort is non-zero then you must connect to all nodes
if your DirPort is non-zero then you must act like a directory server
svn:r192
Diffstat (limited to 'src/or/routers.c')
-rw-r--r-- | src/or/routers.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/or/routers.c b/src/or/routers.c index 0861ca4ccc..9a31b5d9ed 100644 --- a/src/or/routers.c +++ b/src/or/routers.c @@ -19,7 +19,6 @@ static routerinfo_t **router_array = NULL; static int rarray_len = 0; -extern int global_role; /* from main.c */ extern or_options_t options; /* command-line and config-file options */ extern routerinfo_t *my_routerinfo; /* from main.c */ @@ -125,7 +124,7 @@ int router_is_me(uint32_t addr, uint16_t port) { struct sockaddr_in me; /* my router identity */ - if(!ROLE_IS_OR(global_role)) { + if(!options.ORPort) { /* we're not an OR. This obviously isn't us. */ return 0; } |