diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-09-06 11:38:32 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-09-06 11:38:32 -0400 |
| commit | f4cf279eb58f5d0a61f603bd961b58e51cd82bc3 (patch) | |
| tree | 1cba486155d27bb1a4e0dd56032e7825376df264 /src/or/circuitbuild.c | |
| parent | 09c84b50e71a7c65f1b891e396bb9ad811588dad (diff) | |
| download | tor-f4cf279eb58f5d0a61f603bd961b58e51cd82bc3.tar.gz tor-f4cf279eb58f5d0a61f603bd961b58e51cd82bc3.zip | |
Rename extend_info_alloc() --> _new()
Based on a patch from Linus, regenerated so as to not conflict with
Linus's 5535/6363 patches.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 87a3fa67b1..8aa80cd8e2 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -2470,7 +2470,7 @@ circuit_extend(cell_t *cell, circuit_t *circ) log_debug(LD_CIRC|LD_OR,"Next router (%s:%d): %s", fmt_addr(&n_addr), (int)n_port, msg?msg:"????"); - circ->n_hop = extend_info_alloc(NULL /*nickname*/, + circ->n_hop = extend_info_new(NULL /*nickname*/, id_digest, NULL /*onion_key*/, &n_addr, n_port); @@ -3846,7 +3846,7 @@ onion_append_hop(crypt_path_t **head_ptr, extend_info_t *choice) /** Allocate a new extend_info object based on the various arguments. */ extend_info_t * -extend_info_alloc(const char *nickname, const char *digest, +extend_info_new(const char *nickname, const char *digest, crypto_pk_t *onion_key, const tor_addr_t *addr, uint16_t port) { @@ -3887,13 +3887,13 @@ extend_info_from_node(const node_t *node, int for_direct_connect) node->ri ? node->ri->nickname : node->rs->nickname); if (node->ri) - return extend_info_alloc(node->ri->nickname, + return extend_info_new(node->ri->nickname, node->identity, node->ri->onion_pkey, &ap.addr, ap.port); else if (node->rs && node->md) - return extend_info_alloc(node->rs->nickname, + return extend_info_new(node->rs->nickname, node->identity, node->md->onion_pkey, &ap.addr, @@ -5382,7 +5382,7 @@ routerset_contains_bridge(const routerset_t *routerset, if (!routerset) return 0; - extinfo = extend_info_alloc( + extinfo = extend_info_new( NULL, bridge->identity, NULL, &bridge->addr, bridge->port); result = routerset_contains_extendinfo(routerset, extinfo); extend_info_free(extinfo); |