diff options
| author | Roger Dingledine <arma@torproject.org> | 2006-09-09 19:20:27 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2006-09-09 19:20:27 +0000 |
| commit | 9af3175687686841f25cab2fe7e1ade0c66a1ff9 (patch) | |
| tree | 1ab79e1904c1597180c5b6f72a025937fe0d3235 /src/or | |
| parent | 5f6351ceb3d518a19fcf0a2927b140a6dc3d1cd3 (diff) | |
| download | tor-9af3175687686841f25cab2fe7e1ade0c66a1ff9.tar.gz tor-9af3175687686841f25cab2fe7e1ade0c66a1ff9.zip | |
parameterize the loudness of get_interface_address()
svn:r8358
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/config.c | 4 | ||||
| -rw-r--r-- | src/or/connection.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index da0fae43f7..f81a3e1e82 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1638,7 +1638,7 @@ resolve_my_address(int warn_severity, or_options_t *options, log_fn(notice_severity, LD_CONFIG, "Could not resolve guessed local hostname '%s'. " "Trying something else.", hostname); - if (get_interface_address(&interface_ip)) { + if (get_interface_address(warn_severity, &interface_ip)) { log_fn(warn_severity, LD_CONFIG, "Could not get local interface IP address. Failing."); return -1; @@ -1661,7 +1661,7 @@ resolve_my_address(int warn_severity, or_options_t *options, "resolves to a private IP address (%s). Trying something " "else.", hostname, tmpbuf); - if (get_interface_address(&interface_ip)) { + if (get_interface_address(warn_severity, &interface_ip)) { log_fn(warn_severity, LD_CONFIG, "Could not get local interface IP address. Too bad."); } else if (is_internal_IP(interface_ip, 0)) { diff --git a/src/or/connection.c b/src/or/connection.c index 6fc68263ba..88346f8aad 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1999,7 +1999,7 @@ client_check_address_changed(int sock) uint32_t *ip; if (!last_interface_ip) - get_interface_address(&last_interface_ip); + get_interface_address(LOG_INFO, &last_interface_ip); if (!outgoing_addrs) outgoing_addrs = smartlist_create(); @@ -2017,7 +2017,7 @@ client_check_address_changed(int sock) /* Uh-oh. We haven't connected from this address before. Has the interface * address changed? */ - if (get_interface_address(&iface_ip)<0) + if (get_interface_address(LOG_INFO, &iface_ip)<0) return; ip = tor_malloc(sizeof(uint32_t)); *ip = ip_out; |