diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-07-16 05:11:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-07-16 05:11:26 +0000 |
| commit | 82f5e31ff4cc52fac51aa6fa2d2e4939137e313b (patch) | |
| tree | 391f483764b475565c0d24674acf9cd436588020 | |
| parent | 2eaed9368eedb97549b5f52dacfa50686b596ab2 (diff) | |
| parent | b4cc835b0bfc9c4fb35d9069d7f6e11f5a710ee6 (diff) | |
| download | netd-82f5e31ff4cc52fac51aa6fa2d2e4939137e313b.tar.gz | |
Merge "Rework IPv6 address comparison"
| -rw-r--r-- | server/ResolverController.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/ResolverController.cpp b/server/ResolverController.cpp index caf3ee94..52661665 100644 --- a/server/ResolverController.cpp +++ b/server/ResolverController.cpp @@ -74,7 +74,7 @@ bool operator<(const PrivateDnsServer& x, const PrivateDnsServer& y) { } else if (x.ss.ss_family == AF_INET6) { const sockaddr_in6& x_sin6 = reinterpret_cast<const sockaddr_in6&>(x.ss); const sockaddr_in6& y_sin6 = reinterpret_cast<const sockaddr_in6&>(y.ss); - return std::memcmp(x_sin6.sin6_addr.s6_addr, y_sin6.sin6_addr.s6_addr, 16); + return std::memcmp(x_sin6.sin6_addr.s6_addr, y_sin6.sin6_addr.s6_addr, 16) < 0; } return false; // Unknown address type. This is an error. } |