diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-12-29 10:00:34 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-12-29 10:00:34 -0500 |
| commit | e85f0c650c0509ceff777d0a7fafd6c953604ad8 (patch) | |
| tree | 519327dc8872d86669392983c2e2b2459d1c777c /src/common/address.c | |
| parent | 4d6a971ba94f22a86577840cdf1b4935cd445a9b (diff) | |
| parent | de432d55657ee124bce0e9a4d5f5842088e2e13b (diff) | |
| download | tor-e85f0c650c0509ceff777d0a7fafd6c953604ad8.tar.gz tor-e85f0c650c0509ceff777d0a7fafd6c953604ad8.zip | |
Merge branch 'resolvemyaddr_squashed'
Diffstat (limited to 'src/common/address.c')
| -rw-r--r-- | src/common/address.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/common/address.c b/src/common/address.c index 0b475fc9fd..b2431eeba4 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1369,8 +1369,8 @@ tor_addr_is_multicast(const tor_addr_t *a) * connects to the Internet. This address should only be used in checking * whether our address has changed. Return 0 on success, -1 on failure. */ -int -get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr) +MOCK_IMPL(int, +get_interface_address6,(int severity, sa_family_t family, tor_addr_t *addr)) { /* XXX really, this function should yield a smartlist of addresses. */ smartlist_t *addrs; @@ -1699,8 +1699,8 @@ tor_dup_ip(uint32_t addr) * checking whether our address has changed. Return 0 on success, -1 on * failure. */ -int -get_interface_address(int severity, uint32_t *addr) +MOCK_IMPL(int, +get_interface_address,(int severity, uint32_t *addr)) { tor_addr_t local_addr; int r; |