diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-03-12 13:00:34 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-03-12 13:00:34 +0000 |
| commit | 87797bcde58b0a19f420cb41632f331ca2b9040e (patch) | |
| tree | 98ee79137d5c48574c12845bc6d6e2ebf7eeb725 /src/or/connection.c | |
| parent | 6af8d0606f1be27d572f46e8ef03112eedc73928 (diff) | |
| download | tor-87797bcde58b0a19f420cb41632f331ca2b9040e.tar.gz tor-87797bcde58b0a19f420cb41632f331ca2b9040e.zip | |
get rid of those pesky tabs
svn:r1264
Diffstat (limited to 'src/or/connection.c')
| -rw-r--r-- | src/or/connection.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index ec522b2155..b11d82dbcd 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -144,7 +144,7 @@ void connection_free_all(void) { } /* Close the underlying socket for conn, so we don't try to flush it. - * Must be used in conjunction with connection_mark_for_close + * Must be used in conjunction with (right before) connection_mark_for_close */ void connection_close_immediate(connection_t *conn) { @@ -227,7 +227,7 @@ void connection_expire_held_open(void) assert(conn->marked_for_close); if (now - conn->timestamp_lastwritten >= 15) { log_fn(LOG_WARN,"Giving up on marked_for_close conn that's been flushing for 15s (fd %d, type %s, state %d).", - conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state); + conn->s, CONN_TYPE_TO_STRING(conn->type), conn->state); conn->hold_open_until_flushed = 0; } } @@ -419,8 +419,8 @@ int retry_all_connections(void) { if(options.ORPort) { listener_close_if_present(CONN_TYPE_OR_LISTENER); - if(connection_create_listener(options.ORBindAddress, - (uint16_t) options.ORPort, + if(connection_create_listener(options.ORBindAddress, + (uint16_t) options.ORPort, CONN_TYPE_OR_LISTENER) < 0) return -1; } @@ -428,7 +428,7 @@ int retry_all_connections(void) { if(options.DirPort) { listener_close_if_present(CONN_TYPE_DIR_LISTENER); if(connection_create_listener(options.DirBindAddress, - (uint16_t) options.DirPort, + (uint16_t) options.DirPort, CONN_TYPE_DIR_LISTENER) < 0) return -1; } @@ -436,7 +436,7 @@ int retry_all_connections(void) { if(options.SocksPort) { listener_close_if_present(CONN_TYPE_AP_LISTENER); if(connection_create_listener(options.SocksBindAddress, - (uint16_t) options.SocksPort, + (uint16_t) options.SocksPort, CONN_TYPE_AP_LISTENER) < 0) return -1; } |