sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename some functions to start with a uniform prefix

This commit is contained in:
Nick Mathewson 2018-04-18 11:45:44 -04:00
parent 087ace7009
commit bd3f8260a3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/or/connection.c
View File

@ -1,4 +1,4 @@
/* Copyright (c) 2001 Matej Pfajfar. /* Copyright (c) 2001 Matej Pfajfar.
* Copyright (c) 2001-2004, Roger Dingledine. * Copyright (c) 2001-2004, Roger Dingledine.
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
* Copyright (c) 2007-2017, The Tor Project, Inc. */ * Copyright (c) 2007-2017, The Tor Project, Inc. */
@ -138,8 +138,8 @@ static const char *proxy_type_to_string(int proxy_type);
static int get_proxy_type(void); static int get_proxy_type(void);
const tor_addr_t *conn_get_outbound_address(sa_family_t family, const tor_addr_t *conn_get_outbound_address(sa_family_t family,
const or_options_t *options, unsigned int conn_type); const or_options_t *options, unsigned int conn_type);
static void blocked_connection_reenable_init(const or_options_t *options); static void reenable_blocked_connection_init(const or_options_t *options);
static void schedule_blocked_connection_reenable(void); static void reenable_blocked_connection_schedule(void);
/** The last addresses that our network interface seemed to have been /** The last addresses that our network interface seemed to have been
* binding to. We use this as one way to detect when our IP changes. * binding to. We use this as one way to detect when our IP changes.
@ -3093,7 +3093,7 @@ connection_read_bw_exhausted(connection_t *conn, bool is_global_bw)
(void)is_global_bw; (void)is_global_bw;
conn->read_blocked_on_bw = 1; conn->read_blocked_on_bw = 1;
connection_stop_reading(conn); connection_stop_reading(conn);
schedule_blocked_connection_reenable(); reenable_blocked_connection_schedule();
} }
/** /**
@ -3108,7 +3108,7 @@ connection_write_bw_exhausted(connection_t *conn, bool is_global_bw)
(void)is_global_bw; (void)is_global_bw;
conn->write_blocked_on_bw = 1; conn->write_blocked_on_bw = 1;
connection_stop_reading(conn); connection_stop_reading(conn);
schedule_blocked_connection_reenable(); reenable_blocked_connection_schedule();
} }
/** If we have exhausted our global buckets, or the buckets for conn, /** If we have exhausted our global buckets, or the buckets for conn,
@ -3191,7 +3191,7 @@ connection_bucket_init(void)
now_ts); now_ts);
} }
blocked_connection_reenable_init(options); reenable_blocked_connection_init(options);
} }
/** Update the global connection bucket settings to a new value. */ /** Update the global connection bucket settings to a new value. */
@ -3281,7 +3281,7 @@ reenable_blocked_connections_cb(mainloop_event_t *ev, void *arg)
* find themselves blocked on bandwidth. * find themselves blocked on bandwidth.
*/ */
static void static void
blocked_connection_reenable_init(const or_options_t *options) reenable_blocked_connection_init(const or_options_t *options)
{ {
if (! reenable_blocked_connections_ev) { if (! reenable_blocked_connections_ev) {
reenable_blocked_connections_ev = reenable_blocked_connections_ev =
@ -3300,12 +3300,12 @@ blocked_connection_reenable_init(const or_options_t *options)
* scheduled. * scheduled.
*/ */
static void static void
schedule_blocked_connection_reenable(void) reenable_blocked_connection_schedule(void)
{ {
if (reenable_blocked_connections_is_scheduled) if (reenable_blocked_connections_is_scheduled)
return; return;
if (BUG(reenable_blocked_connections_ev == NULL)) { if (BUG(reenable_blocked_connections_ev == NULL)) {
blocked_connection_reenable_init(get_options()); reenable_blocked_connection_init(get_options());
} }
mainloop_event_schedule(reenable_blocked_connections_ev, mainloop_event_schedule(reenable_blocked_connections_ev,
&reenable_blocked_connections_delay); &reenable_blocked_connections_delay);