diff options
author | Nick Mathewson <nickm@torproject.org> | 2012-01-18 15:53:30 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2012-01-18 15:53:30 -0500 |
commit | 26e789fbfd4e5a7e2789c1577e8eb967de3eba86 (patch) | |
tree | 348d58b6bc8b8ae33ea9a5b7e8b0f755586bc534 /src/or/connection.c | |
parent | d1b40cf2e7bb55d3c421e6eff476330e08ab4750 (diff) | |
download | tor-26e789fbfd4e5a7e2789c1577e8eb967de3eba86.tar.gz tor-26e789fbfd4e5a7e2789c1577e8eb967de3eba86.zip |
Rename nonconformant identifiers.
Fixes bug 4893.
These changes are pure mechanical, and were generated with this
perl script:
/usr/bin/perl -w -i.bak -p
s/crypto_pk_env_t/crypto_pk_t/g;
s/crypto_dh_env_t/crypto_dh_t/g;
s/crypto_cipher_env_t/crypto_cipher_t/g;
s/crypto_digest_env_t/crypto_digest_t/g;
s/aes_free_cipher/aes_cipher_free/g;
s/crypto_free_cipher_env/crypto_cipher_free/g;
s/crypto_free_digest_env/crypto_digest_free/g;
s/crypto_free_pk_env/crypto_pk_free/g;
s/_crypto_dh_env_get_dh/_crypto_dh_get_dh/g;
s/_crypto_new_pk_env_rsa/_crypto_new_pk_from_rsa/g;
s/_crypto_pk_env_get_evp_pkey/_crypto_pk_get_evp_pkey/g;
s/_crypto_pk_env_get_rsa/_crypto_pk_get_rsa/g;
s/crypto_new_cipher_env/crypto_cipher_new/g;
s/crypto_new_digest_env/crypto_digest_new/g;
s/crypto_new_digest256_env/crypto_digest256_new/g;
s/crypto_new_pk_env/crypto_pk_new/g;
s/crypto_create_crypto_env/crypto_cipher_new/g;
s/connection_create_listener/connection_listener_new/g;
s/smartlist_create/smartlist_new/g;
s/transport_create/transport_new/g;
Diffstat (limited to 'src/or/connection.c')
-rw-r--r-- | src/or/connection.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/or/connection.c b/src/or/connection.c index 14dfe0a18b..462022dffd 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -44,7 +44,7 @@ #include <pwd.h> #endif -static connection_t *connection_create_listener( +static connection_t *connection_listener_new( const struct sockaddr *listensockaddr, socklen_t listensocklen, int type, const char *address, @@ -244,7 +244,7 @@ or_connection_new(int socket_family) or_conn->timestamp_last_added_nonpadding = time(NULL); or_conn->next_circ_id = crypto_rand_int(1<<15); - or_conn->active_circuit_pqueue = smartlist_create(); + or_conn->active_circuit_pqueue = smartlist_new(); or_conn->active_circuit_pqueue_last_recalibrated = cell_ewma_get_tick(); return or_conn; @@ -858,7 +858,7 @@ make_socket_reuseable(tor_socket_t sock) * to the conn. */ static connection_t * -connection_create_listener(const struct sockaddr *listensockaddr, +connection_listener_new(const struct sockaddr *listensockaddr, socklen_t socklen, int type, const char *address, const port_cfg_t *port_cfg) @@ -1790,7 +1790,7 @@ retry_listener_ports(smartlist_t *old_conns, const smartlist_t *ports, smartlist_t *new_conns) { - smartlist_t *launch = smartlist_create(); + smartlist_t *launch = smartlist_new(); int r = 0; smartlist_add_all(launch, ports); @@ -1866,7 +1866,7 @@ retry_listener_ports(smartlist_t *old_conns, } if (listensockaddr) { - conn = connection_create_listener(listensockaddr, listensocklen, + conn = connection_listener_new(listensockaddr, listensocklen, port->type, address, port); tor_free(listensockaddr); tor_free(address); @@ -1898,7 +1898,7 @@ int retry_all_listeners(smartlist_t *replaced_conns, smartlist_t *new_conns) { - smartlist_t *listeners = smartlist_create(); + smartlist_t *listeners = smartlist_new(); const or_options_t *options = get_options(); int retval = 0; const uint16_t old_or_port = router_get_advertised_or_port(options); @@ -3682,7 +3682,7 @@ client_check_address_changed(tor_socket_t sock) if (!last_interface_ip) get_interface_address(LOG_INFO, &last_interface_ip); if (!outgoing_addrs) - outgoing_addrs = smartlist_create(); + outgoing_addrs = smartlist_new(); if (getsockname(sock, (struct sockaddr*)&out_addr, &out_addr_len)<0) { int e = tor_socket_errno(sock); |