commit 965c9de498ab7f6c7ce3dce133bb34456f3d668e Author: Andrea Shepard andrea@torproject.org Date: Mon Oct 8 19:52:04 2012 -0700

Abolish superfluous channel_find_by_remote_nickname() --- src/or/channel.c | 36 ------------------------------------ src/or/channel.h | 1 - 2 files changed, 0 insertions(+), 37 deletions(-)

diff --git a/src/or/channel.c b/src/or/channel.c index 690bfb9..9b814bb 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -610,42 +610,6 @@ channel_find_by_remote_digest(const char *identity_digest) }

/** - * Find channel by remote nickname - * - * This function looks up a channel by the nickname of the remote - * endpoint. It's possible that more than one channel to that endpoint - * nickname exists, but there is not currently any supported way to iterate - * them. Use digests. - * - * @param nickname A node nickname - * @return A channel pointer to a channel to a node with that nickname, or - * NULL if none is available. - */ - -channel_t * -channel_find_by_remote_nickname(const char *nickname) -{ - channel_t *rv = NULL; - - tor_assert(nickname); - - if (all_channels && smartlist_len(all_channels) > 0) { - SMARTLIST_FOREACH_BEGIN(all_channels, channel_t *, curr) { - if (!(curr->is_listener)) { - if (curr->u.cell_chan.nickname && - strncmp(curr->u.cell_chan.nickname, nickname, - MAX_NICKNAME_LEN) == 0) { - rv = curr; - break; - } - } - } SMARTLIST_FOREACH_END(curr); - } - - return rv; -} - -/** * Next channel with digest * * This function takes a channel and finds the next channel in the list diff --git a/src/or/channel.h b/src/or/channel.h index ed69b92..7075981 100644 --- a/src/or/channel.h +++ b/src/or/channel.h @@ -368,7 +368,6 @@ int channel_is_better(time_t now,

channel_t * channel_find_by_global_id(uint64_t global_identifier); channel_t * channel_find_by_remote_digest(const char *identity_digest); -channel_t * channel_find_by_remote_nickname(const char *nickname);

/** For things returned by channel_find_by_remote_digest(), walk the list. */