From cfc89f875330c9cc015f745cb12c899352d39e43 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Thu, 9 Jun 2005 08:54:42 +0000 Subject: [PATCH] pay more attention to the ClientOnly config option svn:r4367 --- src/or/connection.c | 3 ++- src/or/router.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/connection.c b/src/or/connection.c index 263762f484..a87f27f8a8 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -824,7 +824,8 @@ static int retry_listeners(int type, struct config_line_t *cfg, int retry_all_listeners(int force) { or_options_t *options = get_options(); - if (retry_listeners(CONN_TYPE_OR_LISTENER, options->ORBindAddress, + if (server_mode(options) && + retry_listeners(CONN_TYPE_OR_LISTENER, options->ORBindAddress, options->ORPort, "0.0.0.0", force)<0) return -1; if (retry_listeners(CONN_TYPE_DIR_LISTENER, options->DirBindAddress, diff --git a/src/or/router.c b/src/or/router.c index 56ad0d0caf..1f67e5bd56 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -451,6 +451,7 @@ int clique_mode(or_options_t *options) { /** Return true iff we are trying to be a server. */ int server_mode(or_options_t *options) { + if (options->ClientOnly) return 0; return (options->ORPort != 0 || options->ORBindAddress); }