torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bring assert_connection_ok up to date

Browse Source 
svn:r863
This commit is contained in:
Nick Mathewson
2003-11-23 18:14:19 +00:00
parent 1bcbfc8e74
commit 78c58d8564
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trunk/src/or/connection.c
+5 -8
View File
@@ -717,8 +717,10 @@ void assert_connection_ok(connection_t *conn, time_t now)
* marked_for_close. */
/* buffers */
assert(conn->inbuf);
assert(conn->outbuf);
if (!connection_is_listener(conn)) {
assert(conn->inbuf);
assert(conn->outbuf);
}
assert(!now || conn->timestamp_lastread <= now);
assert(!now || conn->timestamp_lastwritten <= now);
@@ -788,12 +790,7 @@ void assert_connection_ok(connection_t *conn, time_t now)
case CONN_TYPE_AP:
assert(conn->state >= _AP_CONN_STATE_MIN &&
conn->state <= _AP_CONN_STATE_MAX);
if (conn->state == AP_CONN_STATE_SOCKS_WAIT ||
conn->state == AP_CONN_STATE_CIRCUIT_WAIT) {
assert(conn->socks_request);
} else {
assert(!conn->socks_request);
}
assert(conn->socks_request);
break;
case CONN_TYPE_DIR:
assert(conn->state >= _DIR_CONN_STATE_MIN &&