diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-11-04 06:41:49 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-11-04 06:41:49 +0000 |
| commit | 59453ac6ef78f3822d39850fd609272efb49150d (patch) | |
| tree | a8c1a7d32701c547b5459d39ccdc88ad33df59af /src/or/connection.c | |
| parent | b74b72a5ce9dc347e66f786f2be5240945e0d461 (diff) | |
| download | tor-59453ac6ef78f3822d39850fd609272efb49150d.tar.gz tor-59453ac6ef78f3822d39850fd609272efb49150d.zip | |
add a ControlPort and control listener conn.
note that print_usage is obsolete.
svn:r2671
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index c996d63841..809e115733 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -471,7 +471,7 @@ static int connection_init_accepted_conn(connection_t *conn) { conn->state = DIR_CONN_STATE_SERVER_COMMAND_WAIT; break; case CONN_TYPE_CONTROL: - /* XXXX009 NM control */ + conn->state = CONTROL_CONN_STATE_NEEDAUTH; break; } return 0; @@ -651,7 +651,9 @@ int retry_all_listeners(int force) { if (retry_listeners(CONN_TYPE_AP_LISTENER, options.SocksBindAddress, options.SocksPort, "127.0.0.1", force)<0) return -1; - /* XXXX009 control NM */ + if (retry_listeners(CONN_TYPE_CONTROL_LISTENER, NULL, + options.ControlPort, "127.0.0.1", force)<0) + return -1; return 0; } |