Restyled by clang-format

restyled-commits · nivi-apple · commit bc4dd911feb8 · 2024-03-28T23:10:07.000-07:00
diff --git a/src/platform/Darwin/DnssdContexts.cpp b/src/platform/Darwin/DnssdContexts.cpp
@@ -462,8 +462,7 @@ ResolveContext::ResolveContext(void * cbContext, DnssdResolveCallback cb, chip::
                                const char * instanceNameToResolve, BrowseContext * browseCausingResolve,
                                std::shared_ptr<uint32_t> && consumerCounterToUse) :
     browseThatCausedResolve(browseCausingResolve),
-    resolveContextWithSRPType({this, true}),
-    resolveContextWithNonSRPType({this, false})
+    resolveContextWithSRPType({ this, true }), resolveContextWithNonSRPType({ this, false })
 {
     type            = ContextType::Resolve;
     context         = cbContext;
@@ -476,8 +475,7 @@ ResolveContext::ResolveContext(void * cbContext, DnssdResolveCallback cb, chip::
 ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::Inet::IPAddressType cbAddressType,
                                const char * instanceNameToResolve, std::shared_ptr<uint32_t> && consumerCounterToUse) :
     browseThatCausedResolve(nullptr),
-    resolveContextWithSRPType({this, true}),
-    resolveContextWithNonSRPType({this, false})
+    resolveContextWithSRPType({ this, true }), resolveContextWithNonSRPType({ this, false })
 {
     type            = ContextType::Resolve;
     context         = delegate;
@@ -487,7 +485,8 @@ ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::In
     consumerCounter = std::move(consumerCounterToUse);
 }
 
-ResolveContext::~ResolveContext() {
+ResolveContext::~ResolveContext()
+{
     if (this->isSRPTimerRunning)
     {
         CancelSRPTimer(this);
@@ -552,7 +551,8 @@ void ResolveContext::DispatchSuccess()
 
     for (auto & interface : interfaces)
     {
-        if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname, interface.first.isSRPTypeRequested))
+        if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname,
+                                                 interface.first.isSRPTypeRequested))
         {
             break;
         }
@@ -572,7 +572,7 @@ bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceInde
         return false;
     }
 
-    InterfaceKey interfaceKey = {interfaceIndex, hostname, isSRPType};
+    InterfaceKey interfaceKey = { interfaceIndex, hostname, isSRPType };
     auto & interface          = interfaces[interfaceKey];
     auto & ips                = interface.addresses;
 
@@ -621,7 +621,8 @@ bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceInde
                 continue;
             }
 
-            if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname, interface.first.isSRPTypeRequested))
+            if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname,
+                                                     interface.first.isSRPTypeRequested))
             {
                 return true;
             }
@@ -630,7 +631,7 @@ bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceInde
     return false;
 }
 
-CHIP_ERROR ResolveContext::OnNewAddress(const InterfaceKey & interfaceKey,  const struct sockaddr * address)
+CHIP_ERROR ResolveContext::OnNewAddress(const InterfaceKey & interfaceKey, const struct sockaddr * address)
 {
     // If we don't have any information about this interfaceId, just ignore the
     // address, since it won't be usable anyway without things like the port.
@@ -745,7 +746,7 @@ void ResolveContext::OnNewInterface(uint32_t interfaceId, const char * fullname,
     // resolving.
     interface.fullyQualifiedDomainName = hostnameWithDomain;
 
-    InterfaceKey interfaceKey = {interfaceId, hostnameWithDomain, isSRPType};
+    InterfaceKey interfaceKey = { interfaceId, hostnameWithDomain, isSRPType };
     interfaces.insert(std::make_pair(std::move(interfaceKey), std::move(interface)));
 }
 
@@ -762,8 +763,7 @@ InterfaceInfo::InterfaceInfo()
 
 InterfaceInfo::InterfaceInfo(InterfaceInfo && other) :
     service(std::move(other.service)), addresses(std::move(other.addresses)),
-    fullyQualifiedDomainName(std::move(other.fullyQualifiedDomainName)),
-    isDNSLookUpRequested(other.isDNSLookUpRequested)
+    fullyQualifiedDomainName(std::move(other.fullyQualifiedDomainName)), isDNSLookUpRequested(other.isDNSLookUpRequested)
 {
     // Make sure we're not trying to free any state from the other DnssdService,
     // since we took over ownership of its allocated bits.
diff --git a/src/platform/Darwin/DnssdImpl.cpp b/src/platform/Darwin/DnssdImpl.cpp
@@ -288,10 +288,11 @@ static void OnGetAddrInfo(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t i
 
     if (kDNSServiceErr_NoError == err)
     {
-        InterfaceKey interfaceKey = {interfaceId, hostname, contextWithType->isSRPType};
+        InterfaceKey interfaceKey = { interfaceId, hostname, contextWithType->isSRPType };
         sdCtx->OnNewAddress(interfaceKey, address);
 
-        // Set the flag to start the timer for resolve on SRP domain to complete if the key has the SRP type requested flag set to true.
+        // Set the flag to start the timer for resolve on SRP domain to complete if the key has the SRP type requested flag set to
+        // true.
         if (interfaceKey.isSRPTypeRequested)
         {
             sdCtx->shoulStartSRPTimerForResolve = true;
@@ -312,7 +313,8 @@ static void OnGetAddrInfo(DNSServiceRef sdRef, DNSServiceFlags flags, uint32_t i
     }
     else
     {
-        // Since we started a resolve on the SRP domain we are going to start a timer to give the resolve some extra time to complete.
+        // Since we started a resolve on the SRP domain we are going to start a timer to give the resolve some extra time to
+        // complete.
         if (!sdCtx->isSRPTimerRunning)
         {
             CHIP_ERROR error = StartSRPTimer(kSRPTimeoutInMsec, sdCtx);
@@ -339,8 +341,10 @@ static void GetAddrInfo(ResolveContext * sdCtx)
 
         if (!interface.second.isDNSLookUpRequested)
         {
-            ResolveContextWithType * contextWithType = (interface.first.isSRPTypeRequested) ? &sdCtx->resolveContextWithSRPType : &sdCtx->resolveContextWithNonSRPType;
-            auto err = DNSServiceGetAddrInfo(&sdRefCopy, kGetAddrInfoFlags, interfaceId, protocol, hostname, OnGetAddrInfo, contextWithType);
+            ResolveContextWithType * contextWithType =
+                (interface.first.isSRPTypeRequested) ? &sdCtx->resolveContextWithSRPType : &sdCtx->resolveContextWithNonSRPType;
+            auto err = DNSServiceGetAddrInfo(&sdRefCopy, kGetAddrInfoFlags, interfaceId, protocol, hostname, OnGetAddrInfo,
+                                             contextWithType);
             VerifyOrReturn(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
             interface.second.isDNSLookUpRequested = true;
         }
@@ -388,19 +392,22 @@ static CHIP_ERROR Resolve(ResolveContext * sdCtx, uint32_t interfaceId, chip::In
     {
         auto sdRef = sdCtx->serviceRef; // Mandatory copy because of kDNSServiceFlagsShareConnection
 
-        ResolveContextWithType * contextWithType = IsSRPType(domain) ? &sdCtx->resolveContextWithSRPType : &sdCtx->resolveContextWithNonSRPType;
-        err             = DNSServiceResolve(&sdRef, kResolveFlags, interfaceId, name, type, domain, OnResolve, contextWithType);
+        ResolveContextWithType * contextWithType =
+            IsSRPType(domain) ? &sdCtx->resolveContextWithSRPType : &sdCtx->resolveContextWithNonSRPType;
+        err = DNSServiceResolve(&sdRef, kResolveFlags, interfaceId, name, type, domain, OnResolve, contextWithType);
         VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
         sdCtx->shoulStartSRPTimerForResolve = false;
     }
     else
     {
         auto sdRefLocal = sdCtx->serviceRef; // Mandatory copy because of kDNSServiceFlagsShareConnection
-        err             = DNSServiceResolve(&sdRefLocal, kResolveFlags, interfaceId, name, type, kLocalDot, OnResolve, &sdCtx->resolveContextWithNonSRPType);
+        err             = DNSServiceResolve(&sdRefLocal, kResolveFlags, interfaceId, name, type, kLocalDot, OnResolve,
+                                            &sdCtx->resolveContextWithNonSRPType);
         VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
 
         auto sdRefSRP = sdCtx->serviceRef; // Mandatory copy because of kDNSServiceFlagsShareConnection
-        err           = DNSServiceResolve(&sdRefSRP, kResolveFlags, interfaceId, name, type, kSRPDot, OnResolve, &sdCtx->resolveContextWithSRPType);
+        err           = DNSServiceResolve(&sdRefSRP, kResolveFlags, interfaceId, name, type, kSRPDot, OnResolve,
+                                          &sdCtx->resolveContextWithSRPType);
         VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
     }
 
@@ -566,9 +573,9 @@ CHIP_ERROR ChipDnssdResolve(DnssdService * service, chip::Inet::InterfaceId inte
     VerifyOrReturnError(service != nullptr, CHIP_ERROR_INVALID_ARGUMENT);
     VerifyOrReturnError(IsSupportedProtocol(service->mProtocol), CHIP_ERROR_INVALID_ARGUMENT);
 
-    auto regtype     = GetFullType(service);
-    auto interfaceId = GetInterfaceId(interface);
-    const char * domain =  nullptr;
+    auto regtype        = GetFullType(service);
+    auto interfaceId    = GetInterfaceId(interface);
+    const char * domain = nullptr;
 
     if (BrowseContext::sContextDispatchingSuccess != nullptr)
     {
diff --git a/src/platform/Darwin/DnssdImpl.h b/src/platform/Darwin/DnssdImpl.h
@@ -229,11 +229,12 @@ struct InterfaceInfo
 
 struct InterfaceKey
 {
-    InterfaceKey() = default;
+    InterfaceKey()  = default;
     ~InterfaceKey() = default;
     inline bool operator<(const InterfaceKey & other) const
     {
-        return (this->interfaceId < other.interfaceId) || ((this->interfaceId == other.interfaceId) && (this->hostname < other.hostname));
+        return (this->interfaceId < other.interfaceId) ||
+            ((this->interfaceId == other.interfaceId) && (this->hostname < other.hostname));
     }
 
     uint32_t interfaceId;
@@ -243,7 +244,7 @@ struct InterfaceKey
 
 struct ResolveContextWithType
 {
-    ResolveContextWithType() = default;
+    ResolveContextWithType()  = default;
     ~ResolveContextWithType() = default;
 
     ResolveContext * context;
@@ -262,7 +263,7 @@ struct ResolveContext : public GenericContext
     // Indicates whether the timer for 250 msecs should be started
     // to give the resolve on SRP domain some extra time to complete.
     bool shoulStartSRPTimerForResolve = false;
-    bool isSRPTimerRunning = false;
+    bool isSRPTimerRunning            = false;
 
     ResolveContextWithType resolveContextWithSRPType;
     ResolveContextWithType resolveContextWithNonSRPType;

Original file line number	Diff line number	Diff line change
`@@ -462,8 +462,7 @@ ResolveContext::ResolveContext(void * cbContext, DnssdResolveCallback cb, chip::`
`462`	`462`	`const char * instanceNameToResolve, BrowseContext * browseCausingResolve,`
`463`	`463`	`std::shared_ptr<uint32_t> && consumerCounterToUse) :`
`464`	`464`	`browseThatCausedResolve(browseCausingResolve),`
`465`		`- resolveContextWithSRPType({this, true}),`
`466`		`- resolveContextWithNonSRPType({this, false})`
	`465`	`+ resolveContextWithSRPType({ this, true }), resolveContextWithNonSRPType({ this, false })`
`467`	`466`	`{`
`468`	`467`	`type = ContextType::Resolve;`
`469`	`468`	`context = cbContext;`
`@@ -476,8 +475,7 @@ ResolveContext::ResolveContext(void * cbContext, DnssdResolveCallback cb, chip::`
`476`	`475`	`ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::Inet::IPAddressType cbAddressType,`
`477`	`476`	`const char * instanceNameToResolve, std::shared_ptr<uint32_t> && consumerCounterToUse) :`
`478`	`477`	`browseThatCausedResolve(nullptr),`
`479`		`- resolveContextWithSRPType({this, true}),`
`480`		`- resolveContextWithNonSRPType({this, false})`
	`478`	`+ resolveContextWithSRPType({ this, true }), resolveContextWithNonSRPType({ this, false })`
`481`	`479`	`{`
`482`	`480`	`type = ContextType::Resolve;`
`483`	`481`	`context = delegate;`
`@@ -487,7 +485,8 @@ ResolveContext::ResolveContext(CommissioningResolveDelegate * delegate, chip::In`
`487`	`485`	`consumerCounter = std::move(consumerCounterToUse);`
`488`	`486`	`}`
`489`	`487`
`490`		`-ResolveContext::~ResolveContext() {`
	`488`	`+ResolveContext::~ResolveContext()`
	`489`	`+{`
`491`	`490`	`if (this->isSRPTimerRunning)`
`492`	`491`	`{`
`493`	`492`	`CancelSRPTimer(this);`
`@@ -552,7 +551,8 @@ void ResolveContext::DispatchSuccess()`
`552`	`551`
`553`	`552`	`for (auto & interface : interfaces)`
`554`	`553`	`{`
`555`		`- if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname, interface.first.isSRPTypeRequested))`
	`554`	`+ if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname,`
	`555`	`+ interface.first.isSRPTypeRequested))`
`556`	`556`	`{`
`557`	`557`	`break;`
`558`	`558`	`}`
`@@ -572,7 +572,7 @@ bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceInde`
`572`	`572`	`return false;`
`573`	`573`	`}`
`574`	`574`
`575`		`- InterfaceKey interfaceKey = {interfaceIndex, hostname, isSRPType};`
	`575`	`+ InterfaceKey interfaceKey = { interfaceIndex, hostname, isSRPType };`
`576`	`576`	`auto & interface = interfaces[interfaceKey];`
`577`	`577`	`auto & ips = interface.addresses;`
`578`	`578`
`@@ -621,7 +621,8 @@ bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceInde`
`621`	`621`	`continue;`
`622`	`622`	`}`
`623`	`623`
`624`		`- if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname, interface.first.isSRPTypeRequested))`
	`624`	`+ if (TryReportingResultsForInterfaceIndex(interface.first.interfaceId, interface.first.hostname,`
	`625`	`+ interface.first.isSRPTypeRequested))`
`625`	`626`	`{`
`626`	`627`	`return true;`
`627`	`628`	`}`
`@@ -630,7 +631,7 @@ bool ResolveContext::TryReportingResultsForInterfaceIndex(uint32_t interfaceInde`
`630`	`631`	`return false;`
`631`	`632`	`}`
`632`	`633`
`633`		`-CHIP_ERROR ResolveContext::OnNewAddress(const InterfaceKey & interfaceKey, const struct sockaddr * address)`
	`634`	`+CHIP_ERROR ResolveContext::OnNewAddress(const InterfaceKey & interfaceKey, const struct sockaddr * address)`
`634`	`635`	`{`
`635`	`636`	`// If we don't have any information about this interfaceId, just ignore the`
`636`	`637`	`// address, since it won't be usable anyway without things like the port.`
`@@ -745,7 +746,7 @@ void ResolveContext::OnNewInterface(uint32_t interfaceId, const char * fullname,`
`745`	`746`	`// resolving.`
`746`	`747`	`interface.fullyQualifiedDomainName = hostnameWithDomain;`
`747`	`748`
`748`		`- InterfaceKey interfaceKey = {interfaceId, hostnameWithDomain, isSRPType};`
	`749`	`+ InterfaceKey interfaceKey = { interfaceId, hostnameWithDomain, isSRPType };`
`749`	`750`	`interfaces.insert(std::make_pair(std::move(interfaceKey), std::move(interface)));`
`750`	`751`	`}`
`751`	`752`
`@@ -762,8 +763,7 @@ InterfaceInfo::InterfaceInfo()`
`762`	`763`
`763`	`764`	`InterfaceInfo::InterfaceInfo(InterfaceInfo && other) :`
`764`	`765`	`service(std::move(other.service)), addresses(std::move(other.addresses)),`
`765`		`- fullyQualifiedDomainName(std::move(other.fullyQualifiedDomainName)),`
`766`		`- isDNSLookUpRequested(other.isDNSLookUpRequested)`
	`766`	`+ fullyQualifiedDomainName(std::move(other.fullyQualifiedDomainName)), isDNSLookUpRequested(other.isDNSLookUpRequested)`
`767`	`767`	`{`
`768`	`768`	`// Make sure we're not trying to free any state from the other DnssdService,`
`769`	`769`	`// since we took over ownership of its allocated bits.`