summaryrefslogtreecommitdiff
path: root/src/or/connection.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-06-15 11:05:56 -0400
committerNick Mathewson <nickm@torproject.org>2018-06-15 11:05:56 -0400
commitbba998af65c9a414c56824f5779d2c47cf5a6b44 (patch)
treee6fae8b65f5484e442e531f0a8f648805f96cb19 /src/or/connection.h
parentbcc283bcc90ed5ef6f8da22b63df01aea1794b2a (diff)
downloadtor-bba998af65c9a414c56824f5779d2c47cf5a6b44.tar.gz
tor-bba998af65c9a414c56824f5779d2c47cf5a6b44.zip
Extract connection_t into its own header.
Now the entire connection_t hierarchy is extracted from or.h
Diffstat (limited to 'src/or/connection.h')
-rw-r--r--src/or/connection.h34
1 files changed, 3 insertions, 31 deletions
diff --git a/src/or/connection.h b/src/or/connection.h
index df33882398..0ab8962b41 100644
--- a/src/or/connection.h
+++ b/src/or/connection.h
@@ -161,23 +161,8 @@ void connection_buf_add_compress(const char *string, size_t len,
dir_connection_t *conn, int done);
void connection_buf_add_buf(connection_t *conn, buf_t *buf);
-/* DOCDOC connection_get_inbuf_len */
-static size_t connection_get_inbuf_len(connection_t *conn);
-/* DOCDOC connection_get_outbuf_len */
-static size_t connection_get_outbuf_len(connection_t *conn);
-
-static inline size_t
-connection_get_inbuf_len(connection_t *conn)
-{
- return conn->inbuf ? buf_datalen(conn->inbuf) : 0;
-}
-
-static inline size_t
-connection_get_outbuf_len(connection_t *conn)
-{
- return conn->outbuf ? buf_datalen(conn->outbuf) : 0;
-}
-
+size_t connection_get_inbuf_len(connection_t *conn);
+size_t connection_get_outbuf_len(connection_t *conn);
connection_t *connection_get_by_global_id(uint64_t id);
connection_t *connection_get_by_type(int type);
@@ -254,20 +239,7 @@ MOCK_DECL(void, clock_skew_warning,
log_domain_mask_t domain, const char *received,
const char *source));
-/** Check if a connection is on the way out so the OOS handler doesn't try
- * to kill more than it needs. */
-static inline int
-connection_is_moribund(connection_t *conn)
-{
- if (conn != NULL &&
- (conn->conn_array_index < 0 ||
- conn->marked_for_close)) {
- return 1;
- } else {
- return 0;
- }
-}
-
+int connection_is_moribund(connection_t *conn);
void connection_check_oos(int n_socks, int failed);
#ifdef CONNECTION_PRIVATE