Skip to content

Commit

Permalink
More IPv4 conditionals
Browse files Browse the repository at this point in the history
  • Loading branch information
andy31415 committed Jun 14, 2023
1 parent fa7b811 commit 7f12579
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 3 additions & 1 deletion src/lib/dnssd/Advertiser_ImplMinimalMdns.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -914,11 +914,13 @@ void AdvertiserMinMdns::AdvertiseRecords(BroadcastAdvertiseType type)
continue;
}

if (addressType != chip::Inet::IPAddressType::kIPv6)
#if INET_CONFIG_ENABLE_IPV4
if (addressType == chip::Inet::IPAddressType::kIPv4)
{
BroadcastIpAddresses::GetIpv4Into(packetInfo.DestAddress);
}
else
#endif // INET_CONFIG_ENABLE_IPV4
{
BroadcastIpAddresses::GetIpv6Into(packetInfo.DestAddress);
}
Expand Down
8 changes: 6 additions & 2 deletions src/lib/dnssd/minimal_mdns/ResponseSender.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,13 @@ CHIP_ERROR ResponseSender::FlushReply()
char interfaceName[chip::Inet::InterfaceId::kMaxIfNameLength];
mSendState.GetSourceInterfaceId().GetInterfaceName(interfaceName, sizeof(interfaceName));

const char * interfaceType = mSendState.GetSourceAddress().Type() == chip::Inet::IPAddressType::kIPv4
const char * interfaceType =
#if INET_CONFIG_ENABLE_IPV4
mSendState.GetSourceAddress().Type() == chip::Inet::IPAddressType::kIPv4
? "IPv4"
: (mSendState.GetSourceAddress().Type() == chip::Inet::IPAddressType::kIPv6 ? "IPv6" : "???");
:
#endif // INET_CONFIG_ENABLE_IPV4
(mSendState.GetSourceAddress().Type() == chip::Inet::IPAddressType::kIPv6 ? "IPv6" : "???");

ChipLogDetail(Discovery, "Broadcasting mDns reply for query from %s to %s / %s", srcAddressString, interfaceName,
interfaceType);
Expand Down

0 comments on commit 7f12579

Please sign in to comment.