diff options
| author | Roger Dingledine <arma@torproject.org> | 2004-05-12 21:12:33 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2004-05-12 21:12:33 +0000 |
| commit | 1cf183699059c4c9fc430247fb058226ac110ad0 (patch) | |
| tree | fa9e713ba89e11c7422d265638fa5d1c95c0d68e /src/or/or.h | |
| parent | 537fb82cbb3b0488535f94bbccb0899f1b6b027a (diff) | |
| download | tor-1cf183699059c4c9fc430247fb058226ac110ad0.tar tor-1cf183699059c4c9fc430247fb058226ac110ad0.tar.gz | |
break connection_edge_end out of connection_mark_for_close
svn:r1858
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/or/or.h b/src/or/or.h index 7be7f17be..81e5b965b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -357,9 +357,6 @@ /** Length of 'y' portion of 'y.onion' URL. */ #define REND_SERVICE_ID_LEN 16 -/* Reasons used by connection_mark_for_close */ -#define CLOSE_REASON_UNUSED_OR_CONN 100 - #define CELL_DIRECTION_IN 1 #define CELL_DIRECTION_OUT 2 @@ -955,11 +952,11 @@ void connection_free(connection_t *conn); void connection_free_all(void); void connection_about_to_close_connection(connection_t *conn); void connection_close_immediate(connection_t *conn); -int _connection_mark_for_close(connection_t *conn, char reason); +int _connection_mark_for_close(connection_t *conn); -#define connection_mark_for_close(c,r) \ +#define connection_mark_for_close(c) \ do { \ - if (_connection_mark_for_close(c,r)<0) { \ + if (_connection_mark_for_close(c)<0) { \ log(LOG_WARN,"Duplicate call to connection_mark_for_close at %s:%d (first at %s:%d)", \ __FILE__,__LINE__,c->marked_for_close_file,c->marked_for_close); \ } else { \ |