Skip to content

Commit 63e79e4

Browse files
committed
Remove the constants for the DNSServiceFlags
- Either use the DNSServiceFlags value directly in the DNS SD API calls or define a local scoped variable
1 parent 0650e1b commit 63e79e4

File tree

1 file changed

+7
-12
lines changed

1 file changed

+7
-12
lines changed

src/platform/Darwin/DnssdImpl.cpp

+7-12
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ constexpr char kSRPDot[] = "default.service.arpa.";
4141
// The extra time in milliseconds that we will wait for the resolution on the SRP domain to complete.
4242
constexpr uint16_t kSRPTimeoutInMsec = 250;
4343

44-
constexpr DNSServiceFlags kRegisterFlags = kDNSServiceFlagsNoAutoRename;
45-
constexpr DNSServiceFlags kBrowseFlags = kDNSServiceFlagsShareConnection;
46-
constexpr DNSServiceFlags kGetAddrInfoFlags = kDNSServiceFlagsShareConnection;
47-
constexpr DNSServiceFlags kResolveFlags = kDNSServiceFlagsShareConnection;
48-
constexpr DNSServiceFlags kReconfirmRecordFlags = 0;
49-
5044
bool IsSupportedProtocol(DnssdServiceProtocol protocol)
5145
{
5246
return (protocol == DnssdServiceProtocol::kDnssdProtocolUdp) || (protocol == DnssdServiceProtocol::kDnssdProtocolTcp);
@@ -179,10 +173,11 @@ CHIP_ERROR Register(void * context, DnssdPublishCallback callback, uint32_t inte
179173
ChipLogProgress(Discovery, "Registering service %s on host %s with port %u and type: %s on interface id: %" PRIu32,
180174
StringOrNullMarker(name), StringOrNullMarker(hostname), port, StringOrNullMarker(type), interfaceId);
181175

176+
DNSServiceFlags registerFlags = kDNSServiceFlagsNoAutoRename;
182177
RegisterContext * sdCtx = nullptr;
183178
if (CHIP_NO_ERROR == MdnsContexts::GetInstance().GetRegisterContextOfTypeAndName(type, name, &sdCtx))
184179
{
185-
auto err = DNSServiceUpdateRecord(sdCtx->serviceRef, nullptr, kRegisterFlags, record.size(), record.data(), 0 /* ttl */);
180+
auto err = DNSServiceUpdateRecord(sdCtx->serviceRef, nullptr, registerFlags, record.size(), record.data(), 0 /* ttl */);
186181
VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
187182
return CHIP_NO_ERROR;
188183
}
@@ -194,7 +189,7 @@ CHIP_ERROR Register(void * context, DnssdPublishCallback callback, uint32_t inte
194189
VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
195190

196191
DNSServiceRef sdRef;
197-
err = DNSServiceRegister(&sdRef, kRegisterFlags, interfaceId, name, type, kLocalDot, hostname, htons(port), record.size(),
192+
err = DNSServiceRegister(&sdRef, registerFlags, interfaceId, name, type, kLocalDot, hostname, htons(port), record.size(),
198193
record.data(), OnRegister, sdCtx);
199194
VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
200195

@@ -213,7 +208,7 @@ CHIP_ERROR BrowseOnDomain(BrowseHandler * sdCtx, uint32_t interfaceId, const cha
213208
{
214209
auto sdRef = sdCtx->serviceRef; // Mandatory copy because of kDNSServiceFlagsShareConnection
215210

216-
auto err = DNSServiceBrowse(&sdRef, kBrowseFlags, interfaceId, type, domain, OnBrowse, sdCtx);
211+
auto err = DNSServiceBrowse(&sdRef, kDNSServiceFlagsShareConnection, interfaceId, type, domain, OnBrowse, sdCtx);
217212
VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
218213
return CHIP_NO_ERROR;
219214
}
@@ -335,7 +330,7 @@ static void GetAddrInfo(ResolveContext * sdCtx)
335330
ResolveContextWithType * contextWithType =
336331
(interface.first.isSRPResult) ? &sdCtx->resolveContextWithSRPType : &sdCtx->resolveContextWithNonSRPType;
337332
auto err =
338-
DNSServiceGetAddrInfo(&sdRefCopy, kGetAddrInfoFlags, interfaceId, protocol, hostname, OnGetAddrInfo, contextWithType);
333+
DNSServiceGetAddrInfo(&sdRefCopy, kDNSServiceFlagsShareConnection, interfaceId, protocol, hostname, OnGetAddrInfo, contextWithType);
339334
VerifyOrReturn(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
340335
interface.second.isDNSLookUpRequested = true;
341336
}
@@ -372,7 +367,7 @@ static CHIP_ERROR ResolveWithContext(ResolveContext * sdCtx, uint32_t interfaceI
372367
{
373368
auto sdRef = sdCtx->serviceRef; // Mandatory copy because of kDNSServiceFlagsShareConnection
374369

375-
auto err = DNSServiceResolve(&sdRef, kResolveFlags, interfaceId, name, type, domain, OnResolve, contextWithType);
370+
auto err = DNSServiceResolve(&sdRef, kDNSServiceFlagsShareConnection, interfaceId, name, type, domain, OnResolve, contextWithType);
376371
VerifyOrReturnError(kDNSServiceErr_NoError == err, sdCtx->Finalize(err));
377372
return CHIP_NO_ERROR;
378373
}
@@ -655,7 +650,7 @@ CHIP_ERROR ChipDnssdReconfirmRecord(const char * hostname, chip::Inet::IPAddress
655650
return CHIP_ERROR_INVALID_ARGUMENT;
656651
}
657652

658-
auto error = DNSServiceReconfirmRecord(kReconfirmRecordFlags, interfaceId, fullname.c_str(), rrtype, rrclass, rdlen, rdata);
653+
auto error = DNSServiceReconfirmRecord(0 /* DNSServiceFlags */, interfaceId, fullname.c_str(), rrtype, rrclass, rdlen, rdata);
659654
LogOnFailure(__func__, error);
660655

661656
return Error::ToChipError(error);

0 commit comments

Comments
 (0)