summaryrefslogtreecommitdiff
path: root/src/or/dns.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-04-11 12:50:50 -0400
committerNick Mathewson <nickm@torproject.org>2013-01-16 16:57:11 -0500
commit49e619c1cf7ed62334263a89eb031899bc2e7178 (patch)
treeb16cd982baa62c80db14d3671c7c1a355794239a /src/or/dns.c
parente4821fa14de6d76219d4e5c1a320ba263bd5e46d (diff)
downloadtor-49e619c1cf7ed62334263a89eb031899bc2e7178.tar.gz
tor-49e619c1cf7ed62334263a89eb031899bc2e7178.zip
Rename *_isin to *_contains
This is an automatically generated commit, from the following perl script, run with the options "-w -i -p". s/smartlist_string_num_isin/smartlist_contains_int_as_string/g; s/smartlist_string_isin((?:_case)?)/smartlist_contains_string$1/g; s/smartlist_digest_isin/smartlist_contains_digest/g; s/smartlist_isin/smartlist_contains/g; s/digestset_isin/digestset_contains/g;
Diffstat (limited to 'src/or/dns.c')
-rw-r--r--src/or/dns.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/dns.c b/src/or/dns.c
index 556dd1e282..80e7d8b023 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1218,7 +1218,7 @@ is_test_address(const char *address)
{
const or_options_t *options = get_options();
return options->ServerDNSTestAddresses &&
- smartlist_string_isin_case(options->ServerDNSTestAddresses, address);
+ smartlist_contains_string_case(options->ServerDNSTestAddresses, address);
}
/** Called on the OR side when the eventdns library tells us the outcome of a
@@ -1843,7 +1843,7 @@ wildcard_increment_answer(const char *id)
if (*ip > 5 && n_wildcard_requests > 10) {
if (!dns_wildcard_list) dns_wildcard_list = smartlist_new();
- if (!smartlist_string_isin(dns_wildcard_list, id)) {
+ if (!smartlist_contains_string(dns_wildcard_list, id)) {
log(dns_wildcard_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
"Your DNS provider has given \"%s\" as an answer for %d different "
"invalid addresses. Apparently they are hijacking DNS failures. "
@@ -1866,7 +1866,7 @@ add_wildcarded_test_address(const char *address)
if (!dns_wildcarded_test_address_list)
dns_wildcarded_test_address_list = smartlist_new();
- if (smartlist_string_isin_case(dns_wildcarded_test_address_list, address))
+ if (smartlist_contains_string_case(dns_wildcarded_test_address_list, address))
return;
n_test_addrs = get_options()->ServerDNSTestAddresses ?
@@ -2104,7 +2104,7 @@ dns_reset_correctness_checks(void)
static int
answer_is_wildcarded(const char *ip)
{
- return dns_wildcard_list && smartlist_string_isin(dns_wildcard_list, ip);
+ return dns_wildcard_list && smartlist_contains_string(dns_wildcard_list, ip);
}
/** Exit with an assertion if <b>resolve</b> is corrupt. */