summaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-02-14 16:46:49 +0000
committerNick Mathewson <nickm@torproject.org>2007-02-14 16:46:49 +0000
commit4a74812c70b75df8938de00c9efb0fabaf699300 (patch)
tree97448d2c4bfaebebd1bcda64746fd249bbb9d8d2 /src/or/or.h
parent9e7e9e1bfefc6e3bac02cd230fcad48272ba4109 (diff)
downloadtor-4a74812c70b75df8938de00c9efb0fabaf699300.tar.gz
tor-4a74812c70b75df8938de00c9efb0fabaf699300.zip
r11812@catbus: nickm | 2007-02-14 11:22:08 -0500
Apply stream_bw patch from Robert Hogan. svn:r9585
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 6ca830ad33..f96a45b502 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -838,6 +838,14 @@ typedef struct edge_connection_t {
/* XXXX NM This can get re-used after 2**32 streams */
uint32_t global_identifier;
+ /** Bytes read */
+ uint32_t n_read;
+ uint32_t p_read;
+
+ /** Bytes written */
+ uint32_t n_written;
+ uint32_t p_written;
+
/** Exit only: a dirserv connection that is tunneled over this connection
* using a socketpair. */
struct dir_connection_t *bridge_for_conn;
@@ -2329,6 +2337,7 @@ int control_tls_error_to_reason(int e);
int control_event_or_conn_status(or_connection_t *conn,
or_conn_status_event_t e, int reason);
int control_event_bandwidth_used(uint32_t n_read, uint32_t n_written);
+int control_event_stream_bandwidth_used(void);
void control_event_logmsg(int severity, unsigned int domain, const char *msg);
int control_event_descriptors_changed(smartlist_t *routers);
int control_event_address_mapped(const char *from, const char *to,