Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fail A record parsing if IPV4 is disabled in CHIP #17074

Merged
merged 2 commits into from
Apr 5, 2022
Merged

Fail A record parsing if IPV4 is disabled in CHIP #17074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a8990d
Fail A record parsing if IPV4 is disabled in CHIP
andy31415 Apr 5, 2022
51941d6
Enable ARecord parse test in IPV6 as well
andy31415 Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/lib/dnssd/minimal_mdns/RecordData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ bool SrvRecord::Parse(const BytesRange & data, const BytesRange & packet)

bool ParseARecord(const BytesRange & data, chip::Inet::IPAddress * addr)
{
#if INET_CONFIG_ENABLE_IPV4
if (data.Size() != 4)
{
return false;
Expand All @@ -101,6 +102,10 @@ bool ParseARecord(const BytesRange & data, chip::Inet::IPAddress * addr)
addr->Addr[3] = htonl(chip::Encoding::BigEndian::Get32(data.Start()));

return true;
#else
// IPV4 support is disabled: IPAddress should never get IPv4 values.
return false;
#endif
}

bool ParseAAAARecord(const BytesRange & data, chip::Inet::IPAddress * addr)
Expand Down
13 changes: 7 additions & 6 deletions src/lib/dnssd/minimal_mdns/tests/TestRecordData.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ void SrvWithPtrRecord(nlTestSuite * inSuite, void * inContext)
}
}

#if INET_CONFIG_ENABLE_IPV4
void ARecordParsing(nlTestSuite * inSuite, void * inContext)
{
const uint8_t record[] = {
Expand All @@ -117,13 +116,17 @@ void ARecordParsing(nlTestSuite * inSuite, void * inContext)
};

Inet::IPAddress addr;

#if INET_CONFIG_ENABLE_IPV4
Inet::IPAddress expected;

NL_TEST_ASSERT(inSuite, ParseARecord(BytesRange(record, record + sizeof(record)), &addr));
NL_TEST_ASSERT(inSuite, Inet::IPAddress::FromString("10.11.12.13", expected));
NL_TEST_ASSERT(inSuite, addr == expected);
}
#else
NL_TEST_ASSERT(inSuite, !ParseARecord(BytesRange(record, record + sizeof(record)), &addr));
#endif // INET_CONFIG_ENABLE_IPV4
}

void AAAARecordParsing(nlTestSuite * inSuite, void * inContext)
{
Expand Down Expand Up @@ -240,11 +243,9 @@ void TxtRecord(nlTestSuite * inSuite, void * inContext)
}

const nlTest sTests[] = {
NL_TEST_DEF("SrvRecordSimpleParsing", SrvRecordSimpleParsing), //
NL_TEST_DEF("SrvWithPtrRecord", SrvWithPtrRecord), //
#if INET_CONFIG_ENABLE_IPV4
NL_TEST_DEF("SrvRecordSimpleParsing", SrvRecordSimpleParsing), //
NL_TEST_DEF("SrvWithPtrRecord", SrvWithPtrRecord), //
NL_TEST_DEF("ARecordParsing", ARecordParsing), //
#endif // INET_CONFIG_ENABLE_IPV4
NL_TEST_DEF("AAAARecordParsing", AAAARecordParsing), //
NL_TEST_DEF("PtrRecordSimpleParsing", PtrRecordSimpleParsing), //
NL_TEST_DEF("PtrRecordComplexParsing", PtrRecordComplexParsing), //
Expand Down