diff options
| author | Roger Dingledine <arma@torproject.org> | 2003-11-20 17:49:45 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2003-11-20 17:49:45 +0000 |
| commit | 975bb680106f58bc1fced05a932f452e661e0157 (patch) | |
| tree | 878045d9301df8eca9aaa957fd0134d14e963aff /src/or/connection_or.c | |
| parent | 84fffd3652edf6381a487d5b3b08023e39dab763 (diff) | |
| download | tor-975bb680106f58bc1fced05a932f452e661e0157.tar.gz tor-975bb680106f58bc1fced05a932f452e661e0157.zip | |
simplify: options.OnionRouter==1 iff options.ORPort>0
svn:r857
Diffstat (limited to 'src/or/connection_or.c')
| -rw-r--r-- | src/or/connection_or.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 8ba16a9195..212453411b 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -186,7 +186,7 @@ static int connection_tls_finish_handshake(connection_t *conn) { connection_watch_events(conn, POLLIN); log_fn(LOG_DEBUG,"tls handshake done. verifying."); if (! tor_tls_peer_has_cert(conn->tls)) { /* It's an OP. */ - if (options.OnionRouter) { /* I'm an OR; good. */ + if (options.ORPort) { /* I'm an OR; good. */ conn->receiver_bucket = conn->bandwidth = DEFAULT_BANDWIDTH_OP; return 0; } else { /* Neither side sent a certificate: ouch. */ @@ -236,7 +236,7 @@ static int connection_tls_finish_handshake(connection_t *conn) { nickname, conn->nickname); return -1; } - if (!options.OnionRouter) { /* If I'm an OP... */ + if (!options.ORPort) { /* If I'm an OP... */ conn->receiver_bucket = conn->bandwidth = DEFAULT_BANDWIDTH_OP; circuit_n_conn_open(conn); /* send the pending creates, if any. */ } |