Change ServerIdentity to store IPSockAddr instead of IPAddress

The parameter protocol was added to ServerIdentity in order to
identify an unique private DNS server. This is unneeded after
this change since we can check the socket port to achieve the
same purpose.

Bug: 186177613
Test: cd packages/modules/DnsResolver && atest
Change-Id: Ifdad55ea817ff568a84271a5d7b77dd4fbe4772c

1 files changed, 11 insertions, 11 deletions

diff --git a/PrivateDnsConfiguration.cpp b/PrivateDnsConfiguration.cpp
index 610d55b2..9d8872f5 100644
--- a/PrivateDnsConfiguration.cpp
+++ b/PrivateDnsConfiguration.cpp
@@ -280,14 +280,14 @@ bool PrivateDnsConfiguration::recordPrivateDnsValidation(const DnsTlsServer& ser
     auto netPair = mPrivateDnsTransports.find(netId);
     if (netPair == mPrivateDnsTransports.end()) {
         LOG(WARNING) << "netId " << netId << " was erased during private DNS validation";
-        notifyValidationStateUpdate(identity.ip.toString(), Validation::fail, netId);
+        notifyValidationStateUpdate(identity.sockaddr, Validation::fail, netId);
         return DONT_REEVALUATE;
     }
 
     const auto mode = mPrivateDnsModes.find(netId);
     if (mode == mPrivateDnsModes.end()) {
         LOG(WARNING) << "netId " << netId << " has no private DNS validation mode";
-        notifyValidationStateUpdate(identity.ip.toString(), Validation::fail, netId);
+        notifyValidationStateUpdate(identity.sockaddr, Validation::fail, netId);
         return DONT_REEVALUATE;
     }
 
@@ -342,18 +342,18 @@ void PrivateDnsConfiguration::updateServerState(const ServerIdentity& identity,
                                                 uint32_t netId) {
     auto netPair = mPrivateDnsTransports.find(netId);
     if (netPair == mPrivateDnsTransports.end()) {
-        notifyValidationStateUpdate(identity.ip.toString(), Validation::fail, netId);
+        notifyValidationStateUpdate(identity.sockaddr, Validation::fail, netId);
         return;
     }
 
     auto& tracker = netPair->second;
     if (tracker.find(identity) == tracker.end()) {
-        notifyValidationStateUpdate(identity.ip.toString(), Validation::fail, netId);
+        notifyValidationStateUpdate(identity.sockaddr, Validation::fail, netId);
         return;
     }
 
     tracker[identity].setValidationState(state);
-    notifyValidationStateUpdate(identity.ip.toString(), state, netId);
+    notifyValidationStateUpdate(identity.sockaddr, state, netId);
 
     RecordEntry record(netId, identity, state);
     mPrivateDnsLog.push(std::move(record));
@@ -380,11 +380,11 @@ void PrivateDnsConfiguration::setObserver(PrivateDnsValidationObserver* observer
     mObserver = observer;
 }
 
-void PrivateDnsConfiguration::notifyValidationStateUpdate(const std::string& serverIp,
+void PrivateDnsConfiguration::notifyValidationStateUpdate(const netdutils::IPSockAddr& sockaddr,
                                                           Validation validation,
                                                           uint32_t netId) const {
     if (mObserver) {
-        mObserver->onValidationStateUpdate(serverIp, validation, netId);
+        mObserver->onValidationStateUpdate(sockaddr.ip().toString(), validation, netId);
     }
 }
 
@@ -393,10 +393,10 @@ void PrivateDnsConfiguration::dump(netdutils::DumpWriter& dw) const {
     netdutils::ScopedIndent indentStats(dw);
 
     for (const auto& record : mPrivateDnsLog.copy()) {
-        dw.println(fmt::format("{} - netId={} PrivateDns={{{}/{}}} state={}",
-                               timestampToString(record.timestamp), record.netId,
-                               record.serverIdentity.ip.toString(), record.serverIdentity.name,
-                               validationStatusToString(record.state)));
+        dw.println(fmt::format(
+                "{} - netId={} PrivateDns={{{}/{}}} state={}", timestampToString(record.timestamp),
+                record.netId, record.serverIdentity.sockaddr.toString(),
+                record.serverIdentity.provider, validationStatusToString(record.state)));
     }
     dw.blankline();
 }