diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-11 16:23:42 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-11 16:24:29 -0400 |
| commit | 44ad73457303ed0bf80f6c4c645a62e03b42149b (patch) | |
| tree | a7aeb75625c0643b7c2434dc4c57beecd87e8826 /src/common/address.c | |
| parent | 7206d784dc3def970d5bd8618242f7b9c9c71e37 (diff) | |
| parent | 59f9097d5c3dc010847c359888d31757d1c97904 (diff) | |
| download | tor-44ad73457303ed0bf80f6c4c645a62e03b42149b.tar.gz tor-44ad73457303ed0bf80f6c4c645a62e03b42149b.zip | |
Merge remote-tracking branch 'public/3122_memcmp_squashed' into bug3122_memcmp_022
Conflicts throughout. All resolved in favor of taking HEAD and
adding tor_mem* or fast_mem* ops as appropriate.
src/common/Makefile.am
src/or/circuitbuild.c
src/or/directory.c
src/or/dirserv.c
src/or/dirvote.c
src/or/networkstatus.c
src/or/rendclient.c
src/or/rendservice.c
src/or/router.c
src/or/routerlist.c
src/or/routerparse.c
src/or/test.c
Diffstat (limited to 'src/common/address.c')
| -rw-r--r-- | src/common/address.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/common/address.c b/src/common/address.c index aff517ca51..34e109fcf4 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -837,7 +837,7 @@ tor_addr_compare_masked(const tor_addr_t *addr1, const tor_addr_t *addr2, const uint8_t *a2 = tor_addr_to_in6_addr8(addr2); const int bytes = mbits >> 3; const int leftover_bits = mbits & 7; - if (bytes && (r = memcmp(a1, a2, bytes))) { + if (bytes && (r = tor_memcmp(a1, a2, bytes))) { return r; } else if (leftover_bits) { uint8_t b1 = a1[bytes] >> (8-leftover_bits); |