@@ -41,12 +41,6 @@ constexpr char kSRPDot[] = "default.service.arpa.";
41
41
// The extra time in milliseconds that we will wait for the resolution on the SRP domain to complete.
42
42
constexpr uint16_t kSRPTimeoutInMsec = 250 ;
43
43
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
-
50
44
bool IsSupportedProtocol (DnssdServiceProtocol protocol)
51
45
{
52
46
return (protocol == DnssdServiceProtocol::kDnssdProtocolUdp ) || (protocol == DnssdServiceProtocol::kDnssdProtocolTcp );
@@ -179,10 +173,11 @@ CHIP_ERROR Register(void * context, DnssdPublishCallback callback, uint32_t inte
179
173
ChipLogProgress (Discovery, " Registering service %s on host %s with port %u and type: %s on interface id: %" PRIu32,
180
174
StringOrNullMarker (name), StringOrNullMarker (hostname), port, StringOrNullMarker (type), interfaceId);
181
175
176
+ DNSServiceFlags registerFlags = kDNSServiceFlagsNoAutoRename ;
182
177
RegisterContext * sdCtx = nullptr ;
183
178
if (CHIP_NO_ERROR == MdnsContexts::GetInstance ().GetRegisterContextOfTypeAndName (type, name, &sdCtx))
184
179
{
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 */ );
186
181
VerifyOrReturnError (kDNSServiceErr_NoError == err, sdCtx->Finalize (err));
187
182
return CHIP_NO_ERROR;
188
183
}
@@ -194,7 +189,7 @@ CHIP_ERROR Register(void * context, DnssdPublishCallback callback, uint32_t inte
194
189
VerifyOrReturnError (kDNSServiceErr_NoError == err, sdCtx->Finalize (err));
195
190
196
191
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 (),
198
193
record.data (), OnRegister, sdCtx);
199
194
VerifyOrReturnError (kDNSServiceErr_NoError == err, sdCtx->Finalize (err));
200
195
@@ -213,7 +208,7 @@ CHIP_ERROR BrowseOnDomain(BrowseHandler * sdCtx, uint32_t interfaceId, const cha
213
208
{
214
209
auto sdRef = sdCtx->serviceRef ; // Mandatory copy because of kDNSServiceFlagsShareConnection
215
210
216
- auto err = DNSServiceBrowse (&sdRef, kBrowseFlags , interfaceId, type, domain, OnBrowse, sdCtx);
211
+ auto err = DNSServiceBrowse (&sdRef, kDNSServiceFlagsShareConnection , interfaceId, type, domain, OnBrowse, sdCtx);
217
212
VerifyOrReturnError (kDNSServiceErr_NoError == err, sdCtx->Finalize (err));
218
213
return CHIP_NO_ERROR;
219
214
}
@@ -335,7 +330,7 @@ static void GetAddrInfo(ResolveContext * sdCtx)
335
330
ResolveContextWithType * contextWithType =
336
331
(interface.first .isSRPResult ) ? &sdCtx->resolveContextWithSRPType : &sdCtx->resolveContextWithNonSRPType ;
337
332
auto err =
338
- DNSServiceGetAddrInfo (&sdRefCopy, kGetAddrInfoFlags , interfaceId, protocol, hostname, OnGetAddrInfo, contextWithType);
333
+ DNSServiceGetAddrInfo (&sdRefCopy, kDNSServiceFlagsShareConnection , interfaceId, protocol, hostname, OnGetAddrInfo, contextWithType);
339
334
VerifyOrReturn (kDNSServiceErr_NoError == err, sdCtx->Finalize (err));
340
335
interface.second .isDNSLookUpRequested = true ;
341
336
}
@@ -372,7 +367,7 @@ static CHIP_ERROR ResolveWithContext(ResolveContext * sdCtx, uint32_t interfaceI
372
367
{
373
368
auto sdRef = sdCtx->serviceRef ; // Mandatory copy because of kDNSServiceFlagsShareConnection
374
369
375
- auto err = DNSServiceResolve (&sdRef, kResolveFlags , interfaceId, name, type, domain, OnResolve, contextWithType);
370
+ auto err = DNSServiceResolve (&sdRef, kDNSServiceFlagsShareConnection , interfaceId, name, type, domain, OnResolve, contextWithType);
376
371
VerifyOrReturnError (kDNSServiceErr_NoError == err, sdCtx->Finalize (err));
377
372
return CHIP_NO_ERROR;
378
373
}
@@ -655,7 +650,7 @@ CHIP_ERROR ChipDnssdReconfirmRecord(const char * hostname, chip::Inet::IPAddress
655
650
return CHIP_ERROR_INVALID_ARGUMENT;
656
651
}
657
652
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);
659
654
LogOnFailure (__func__, error);
660
655
661
656
return Error::ToChipError (error);
0 commit comments