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.h | |
| parent | 4d6a971ba94f22a86577840cdf1b4935cd445a9b (diff) | |
| parent | de432d55657ee124bce0e9a4d5f5842088e2e13b (diff) | |
| download | tor-e85f0c650c0509ceff777d0a7fafd6c953604ad8.tar.gz tor-e85f0c650c0509ceff777d0a7fafd6c953604ad8.zip | |
Merge branch 'resolvemyaddr_squashed'
Diffstat (limited to 'src/common/address.h')
| -rw-r--r-- | src/common/address.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/common/address.h b/src/common/address.h index e8bab223a7..042daa782a 100644 --- a/src/common/address.h +++ b/src/common/address.h @@ -159,7 +159,8 @@ char *tor_dup_addr(const tor_addr_t *addr) ATTR_MALLOC; const char *fmt_addr_impl(const tor_addr_t *addr, int decorate); const char *fmt_addrport(const tor_addr_t *addr, uint16_t port); const char * fmt_addr32(uint32_t addr); -int get_interface_address6(int severity, sa_family_t family, tor_addr_t *addr); +MOCK_DECL(int,get_interface_address6,(int severity, sa_family_t family, +tor_addr_t *addr)); /** Flag to specify how to do a comparison between addresses. In an "exact" * comparison, addresses are equivalent only if they are in the same family @@ -236,7 +237,7 @@ int addr_mask_get_bits(uint32_t mask); #define INET_NTOA_BUF_LEN 16 int tor_inet_ntoa(const struct in_addr *in, char *buf, size_t buf_len); char *tor_dup_ip(uint32_t addr) ATTR_MALLOC; -int get_interface_address(int severity, uint32_t *addr); +MOCK_DECL(int,get_interface_address,(int severity, uint32_t *addr)); tor_addr_port_t *tor_addr_port_new(const tor_addr_t *addr, uint16_t port); |