8000 Add Compare IPAddress in OndiscoveredNode by joonhaengHeo · Pull Request #33583 · project-chip/connectedhomeip · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content
/ connectedhomeip Public
< 8000 ul class="pagehead-actions flex-shrink-0 d-none d-md-inline" style="padding: 2px 0;">
  • Notifications You must be signed in to change notification settings
  • Fork 2.2k
  • Star 7.9k

    • Add Compare IPAddress in OndiscoveredNode #33583

    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

    Merged
    merged 12 commits into from
    Jun 4, 2024
    Merged

    Add Compare IPAddress in OndiscoveredNode #33583

    Show file tree
    Hide file tree
    Changes from all commits
    Commits
    Show all changes
    12 commits
    Select commit Hold shift + click to select a range
    f0ce64b
    Add Compare IPAddress in discoveredNode
    joonhaengHeo May 23, 2024
    19e0a8c
    Restyled by clang-format
    restyled-commits May 24, 2024
    b5c1fb2
    Fix function name, pointer -> array
    joonhaengHeo May 24, 2024
    64948d4
    Restyled by clang-format
    restyled-commits May 24, 2024
    1ef74e4
    Modify from comment
    joonhaengHeo May 26, 2024
    54cc111
    Restyled by clang-format
    restyled-commits May 26, 2024
    33f50ad
    Merge branch 'master' into add_compare_ipaddress_discoverednode
    joonhaengHeo May 27, 2024
    70a563f
    Update from comments
    joonhaengHeo May 28, 2024
    4c629fa
    Merge branch 'master' into add_compare_ipaddress_discoverednode
    joonhaengHeo May 28, 2024
    6f06f3b
    Merge branch 'master' into add_compare_ipaddress_discoverednode
    joonhaengHeo May 29, 2024
    bf57502
    Merge branch 'master' into add_compare_ipaddress_discoverednode
    joonhaengHeo Jun 3, 2024
    cc71cbb
    Update src/controller/AbstractDnssdDiscoveryController.cpp
    yunhanw-google Jun 4, 2024
    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
    33 changes: 30 additions & 3 deletions src/controller/AbstractDnssdDiscoveryController.cpp
    View file
    Open in desktop
    Original file line number Diff line number Diff line change
    Expand Up @@ -22,9 +22,36 @@
    #include <lib/core/CHIPEncoding.h>
    #include <lib/support/logging/CHIPLogging.h>

    #include <bitset>

    namespace chip {
    namespace Controller {

    static bool SameExceptOrder(const chip::Span<const Inet::IPAddress> & v1, const chip::Span<const Inet::IPAddress> & v2)
    {
    std::bitset<chip::Dnssd::CommonResolutionData::kMaxIPAddresses> addressUsed;

    VerifyOrDie(v1.size() <= Dnssd::CommissionNodeData::kMaxIPAddresses && v2.size() <= Dnssd::CommissionNodeData::kMaxIPAddresses);
    if (v1.size() != v2.size())
    {
    return false;
    }

    for (size_t s = 0; s < v1.size(); s++)
    {
    for (size_t d = 0; d < v2.size(); d++)
    {
    if (!addressUsed[d] && v1[s] == v2[d])
    {
    // Change the used flag so that the compared target is no longer used
    addressUsed.set(d, true);
    break;
    }
    }
    }
    return addressUsed.count() == v2.size();
    }

    void AbstractDnssdDiscoveryController::OnNodeDiscovered(const chip::Dnssd::DiscoveredNodeData & discNodeData)
    {
    VerifyOrReturn(discNodeData.Is<chip::Dnssd::CommissionNodeData>());
    Expand All @@ -38,10 +65,10 @@ void AbstractDnssdDiscoveryController::OnNodeDiscovered(const chip::Dnssd::Disco
    {
    continue;
    }
    // TODO(#32576) Check if IP address are the same. Must account for `numIPs` in the list of `ipAddress`.
    // Additionally, must NOT assume that the ordering is consistent.
    chip::Span<const Inet::IPAddress> discoveredNodeIPAddressSpan(&discoveredNode.ipAddress[0], discoveredNode.numIPs);
    chip::Span<const Inet::IPAddress> nodeDataIPAddressSpan(&nodeData.ipAddress[0], nodeData.numIPs);
    if (strcmp(discoveredNode.hostName, nodeData.hostName) == 0 && discoveredNode.port == nodeData.port &&
    discoveredNode.numIPs == nodeData.numIPs)
    SameExceptOrder(discoveredNodeIPAddressSpan, nodeDataIPAddressSpan))
    {
    discoveredNode = nodeData;
    if (mDeviceDiscoveryDelegate != nullptr)
    Expand Down
    101 changes: 101 additions & 0 deletions src/controller/tests/TestCommissionableNodeController.cpp
    View file
    Open in desktop
    Original file line number Diff line number Diff line change
    Expand Up @@ -182,4 +182,105 @@ TEST_F(TestCommissionableNodeController, TestDiscoverCommissioners_DiscoverCommi
    EXPECT_NE(controller.DiscoverCommissioners(), CHIP_NO_ERROR);
    }

    TEST_F(TestCommissionableNodeController, TestGetDiscoveredCommissioner_MultipleIPAddressDiscover)
    {
    MockResolver resolver;
    CommissionableNodeController controller(&resolver);

    // example 1
    chip::Dnssd::DiscoveredNodeData discNodeData1;
    discNodeData1.Set<chip::Dnssd::CommissionNodeData>();
    chip::Dnssd::CommissionNodeData & inNodeData1 = discNodeData1.Get<chip::Dnssd::CommissionNodeData>();
    Platform::CopyString(inNodeData1.hostName, "mockHostName");
    Inet::IPAddress::FromString("fd11:1111:1122:2222:1111:2222:3333:4444", inNodeData1.ipAddress[0]);
    inNodeData1.numIPs++;
    Inet::IPAddress::FromString("fd11:1111:1122:2222:2222:3333:4444:5555", inNodeData1.ipAddress[1]);
    inNodeData1.numIPs++;
    inNodeData1.port = 5540;

    controller.OnNodeDiscovered(discNodeData1);

    // example 5 - exactly same as example 1
    chip::Dnssd::DiscoveredNodeData discNodeData5;
    discNodeData5.Set<chip::Dnssd::CommissionNodeData>();
    chip::Dnssd::CommissionNodeData & inNodeData5 = discNodeData5.Get<chip::Dnssd::CommissionNodeData>();
    Platform::CopyString(inNodeData1.hostName, "mockHostName");
    Inet::IPAddress::FromString("fd11:1111:1122:2222:1111:2222:3333:4444", inNodeData5.ipAddress[0]);
    inNodeData5.numIPs++;
    Inet::IPAddress::FromString("fd11:1111:1122:2222:2222:3333:4444:5555", inNodeData5.ipAddress[1]);
    inNodeData5.numIPs++;
    inNodeData5.port = 5540;

    controller.OnNodeDiscovered(discNodeData5);

    // example 2 - same as example 1 (IPAdress sequence is only different.)
    chip::Dnssd::DiscoveredNodeData discNodeData2;
    discNodeData2.Set<chip::Dnssd::CommissionNodeData>();
    chip::Dnssd::CommissionNodeData & inNodeData2 = discNodeData2.Get<chip::Dnssd::CommissionNodeData>();
    Platform::CopyString(inNodeData2.hostName, "mockHostName");
    Inet::IPAddress::FromString("fd11:1111:1122:2222:2222:3333:4444:5555", inNodeData2.ipAddress[0]);
    inNodeData2.numIPs++;
    Inet::IPAddress::FromString("fd11:1111:1122:2222:1111:2222:3333:4444", inNodeData2.ipAddress[1]);
    inNodeData2.numIPs++;
    inNodeData2.port = 5540;

    controller.OnNodeDiscovered(discNodeData2);

    // example 3 - different example
    chip::Dnssd::DiscoveredNodeData discNodeData3;
    discNodeData3.Set<chip::Dnssd::CommissionNodeData>();
    chip::Dnssd::CommissionNodeData & inNodeData3 = discNodeData3.Get<chip::Dnssd::CommissionNodeData>();
    Platform::CopyString(inNodeData3.hostName, "mockHostName");
    Inet::IPAddress::FromString("fd11:1111:1122:2222:1111:2222:3333:4444", inNodeData3.ipAddress[0]);
    inNodeData3.numIPs++;
    Inet::IPAddress::FromString("fd11:1111:1122:2222:2222:3333:4444:6666", inNodeData3.ipAddress[1]);
    inNodeData3.numIPs++;
    inNodeData3.port = 5540;

    controller.OnNodeDiscovered(discNodeData3);

    // example 4 - different example (Different IP count)
    chip::Dnssd::DiscoveredNodeData discNodeData4;
    discNodeData4.Set<chip::Dnssd::CommissionNodeData>();
    chip::Dnssd::CommissionNodeData & inNodeData4 = discNodeData4.Get<chip::Dnssd::CommissionNodeData>();
    Platform::CopyString(inNodeData4.hostName, "mockHostName");
    Inet::IPAddress::FromString("fd11:1111:1122:2222:1111:2222:3333:4444", inNodeData4.ipAddress[0]);
    inNodeData4.numIPs++;
    Inet::IPAddress::FromString("fd11:1111:1122:2222:2222:3333:4444:6666", inNodeData4.ipAddress[1]);
    inNodeData4.numIPs++;
    Inet::IPAddress::FromString("fd11:1111:1122:2222:2222:3333:4444:7777", inNodeData4.ipAddress[2]);
    inNodeData4.numIPs++;
    inNodeData4.port = 5540;

    controller.OnNodeDiscovered(discNodeData4);

    // Example 2 result - example 1 is removed. (reason : duplicate)
    ASSERT_NE(controller.GetDiscoveredCommissioner(0), nullptr);
    EXPECT_STREQ(inNodeData1.hostName, controller.GetDiscoveredCommissioner(0)->hostName);
    EXPECT_EQ(inNodeData2.ipAddress[0], controller.GetDiscoveredCommissioner(0)->ipAddress[0]);
    EXPECT_EQ(inNodeData2.ipAddress[1], controller.GetDiscoveredCommissioner(0)->ipAddress[1]);
    EXPECT_EQ(controller.GetDiscoveredCommissioner(0)->port, 5540);
    EXPECT_EQ(controller.GetDiscoveredCommissioner(0)->numIPs, 2u);

    // Example 3 result
    ASSERT_NE(controller.GetDiscoveredCommissioner(1), nullptr);
    EXPECT_STREQ(inNodeData3.hostName, controller.GetDiscoveredCommissioner(1)->hostName);
    EXPECT_EQ(inNodeData3.ipAddress[0], controller.GetDiscoveredCommissioner(1)->ipAddress[0]);
    EXPECT_EQ(inNodeData3.ipAddress[1], controller.GetDiscoveredCommissioner(1)->ipAddress[1]);
    EXPECT_EQ(controller.GetDiscoveredCommissioner(1)->port, 5540);
    EXPECT_EQ(controller.GetDiscoveredCommissioner(1)->numIPs, 2u);

    // Example 4 result
    ASSERT_NE(controller.GetDiscoveredCommissioner(2), nullptr);
    EXPECT_STREQ(inNodeData4.hostName, controller.GetDiscoveredCommissioner(2)->hostName);
    EXPECT_EQ(inNodeData4.ipAddress[0], controller.GetDiscoveredCommissioner(2)->ipAddress[0]);
    EXPECT_EQ(inNodeData4.ipAddress[1], controller.GetDiscoveredCommissioner(2)->ipAddress[1]);
    EXPECT_EQ(inNodeData4.ipAddress[2], controller.GetDiscoveredCommissioner(2)->ipAddress[2]);
    EXPECT_EQ(controller.GetDiscoveredCommissioner(2)->port, 5540);
    EXPECT_EQ(controller.GetDiscoveredCommissioner(2)->numIPs, 3u);

    // Total is 3. (Not 4)
    ASSERT_EQ(controller.GetDiscoveredCommissioner(3), nullptr);
    }

    } // namespace
    Loading
    0