aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Shepard <andrea@torproject.org>2013-10-31 20:59:06 -0700
committerAndrea Shepard <andrea@torproject.org>2014-09-30 22:49:02 -0700
commitf0533d8d223c40e487bbddc46256856f80e96389 (patch)
tree5287eecf6a46967a77590b9e5e0a906ab0e888a3
parentb09f41424c7e0da63733c2fdda5332d63a7f4e0f (diff)
downloadtor-f0533d8d223c40e487bbddc46256856f80e96389.tar.gz
tor-f0533d8d223c40e487bbddc46256856f80e96389.zip
Remove no-longer-used channel_tls_t functions
-rw-r--r--src/or/channeltls.c52
-rw-r--r--src/or/channeltls.h2
2 files changed, 0 insertions, 54 deletions
diff --git a/src/or/channeltls.c b/src/or/channeltls.c
index b828b152b5..7df2d35d93 100644
--- a/src/or/channeltls.c
+++ b/src/or/channeltls.c
@@ -913,58 +913,6 @@ channel_tls_handle_state_change_on_orconn(channel_tls_t *chan,
}
}
-/**
- * Flush cells from a channel_tls_t
- *
- * Try to flush up to about num_cells cells, and return how many we flushed.
- */
-
-ssize_t
-channel_tls_flush_some_cells(channel_tls_t *chan, ssize_t num_cells)
-{
- ssize_t flushed = 0;
-
- tor_assert(chan);
-
- if (flushed >= num_cells) goto done;
-
- /*
- * If channel_tls_t ever buffers anything below the channel_t layer, flush
- * that first here.
- */
-
- flushed += channel_flush_some_cells(TLS_CHAN_TO_BASE(chan),
- num_cells - flushed);
-
- /*
- * If channel_tls_t ever buffers anything below the channel_t layer, check
- * how much we actually got and push it on down here.
- */
-
- done:
- return flushed;
-}
-
-/**
- * Check if a channel_tls_t has anything to flush
- *
- * Return true if there is any more to flush on this channel (cells in queue
- * or active circuits).
- */
-
-int
-channel_tls_more_to_flush(channel_tls_t *chan)
-{
- tor_assert(chan);
-
- /*
- * If channel_tls_t ever buffers anything below channel_t, the
- * check for that should go here first.
- */
-
- return channel_more_to_flush(TLS_CHAN_TO_BASE(chan));
-}
-
#ifdef KEEP_TIMING_STATS
/**
diff --git a/src/or/channeltls.h b/src/or/channeltls.h
index c872a09d79..5eb6e126bc 100644
--- a/src/or/channeltls.h
+++ b/src/or/channeltls.h
@@ -40,8 +40,6 @@ channel_t * channel_tls_to_base(channel_tls_t *tlschan);
channel_tls_t * channel_tls_from_base(channel_t *chan);
/* Things for connection_or.c to call back into */
-ssize_t channel_tls_flush_some_cells(channel_tls_t *chan, ssize_t num_cells);
-int channel_tls_more_to_flush(channel_tls_t *chan);
void channel_tls_handle_cell(cell_t *cell, or_connection_t *conn);
void channel_tls_handle_state_change_on_orconn(channel_tls_t *chan,
or_connection_t *conn,