Skip to content

[IpAddress]: add mcast scope on address and isFullMask method on prefix #285

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
lguohan merged 2 commits into from
Jun 29, 2019
Merged

[IpAddress]: add mcast scope on address and isFullMask method on prefix #285

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
5ecac60
Support VRF
Jun 3, 2019
d116f57
Add unit test for modification to support vrf
Jun 24, 2019
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
14 changes: 14 additions & 0 deletions common/ipaddress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,14 @@ IpAddress::AddrScope IpAddress::getAddrScope() const
static const IpAddress ipv6LinkScopeAddress = IpAddress("FE80::0");
static const IpAddress ipv4HostScopeAddress = IpAddress("127.0.0.1");
static const IpAddress ipv6HostScopeAddress = IpAddress("::1");
static const IpAddress ipv4McastScopeAddress = IpAddress("224.0.0.0");
static const IpAddress ipv6McastScopeAddress = IpAddress("FF00::0");

if (isV4())
{
const uint32_t ip1 = htonl(getV4Addr());
const uint32_t ip2 = htonl(ipv4LinkScopeAddress.getV4Addr());
const uint32_t ip3 = htonl(ipv4McastScopeAddress.getV4Addr());

/* IPv4 local-scope mask is 16 bits long -- mask = 0xffff0000 */
if ((ip1 & 0xffff0000) == ip2)
Expand All @@ -60,11 +63,17 @@ IpAddress::AddrScope IpAddress::getAddrScope() const
{
return HOST_SCOPE;
}
/* IPv4 multicast-scope mask is 4 bits long -- mask = 0xf0000000 */
else if ((ip1 & 0xf0000000) == ip3)
{
return MCAST_SCOPE;
}
}
else
{
const uint8_t *ip1 = getV6Addr();
const uint8_t *ip2 = ipv6LinkScopeAddress.getV6Addr();
const uint8_t *ip3 = ipv6McastScopeAddress.getV6Addr();

/* IPv6 local-scope mask is 10 bits long -- mask = 0xffc0::0 */
if ((ip1[0] == ip2[0]) && ((ip1[1] & 0xc0) == ip2[1]))
Expand All @@ -75,6 +84,11 @@ IpAddress::AddrScope IpAddress::getAddrScope() const
{
return HOST_SCOPE;
}
/* IPv6 multicast-scope mask is 8 bits long -- mask = 0xff00::0 */
else if (ip1[0] == ip3[0])
{
return MCAST_SCOPE;
}
}

return GLOBAL_SCOPE;
Expand Down
3 changes: 2 additions & 1 deletion common/ipaddress.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ class IpAddress
enum AddrScope {
GLOBAL_SCOPE,
LINK_SCOPE,
HOST_SCOPE
HOST_SCOPE,
MCAST_SCOPE
};

IpAddress::AddrScope getAddrScope() const;
Expand Down
8 changes: 8 additions & 0 deletions common/ipprefix.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,14 @@ class IpPrefix
return (m_mask == 0);
}

inline bool isFullMask() const
{
if (m_ip.isV4())
return (m_mask == 32);
else
return (m_mask == 128);
}

inline bool isAddressInSubnet(const IpAddress& addr) const
{
if (m_ip.getIp().family != addr.getIp().family)
Expand Down
8 changes: 8 additions & 0 deletions tests/ipaddress_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ TEST(IpAddress, getAddrScope)
IpAddress ip5("169.253.1.1");
IpAddress ip6("169.255.1.1");
IpAddress ip7("127.0.0.1");
IpAddress ip8("224.0.0.1");
IpAddress ip9("239.255.255.255");

// IPv6 prefixes
IpAddress ip11("2001:4898:f0:f153:357c:77b2:49c9:627c");
Expand All @@ -54,6 +56,8 @@ TEST(IpAddress, getAddrScope)
IpAddress ip16("febf:1::1");
IpAddress ip17("fec0:1::1");
IpAddress ip18("::1");
IpAddress ip19("ff00::1");
IpAddress ip20("ffff:1::1");

EXPECT_EQ(IpAddress::AddrScope::GLOBAL_SCOPE, ip1.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::GLOBAL_SCOPE, ip2.getAddrScope());
Expand All @@ -62,6 +66,8 @@ TEST(IpAddress, getAddrScope)
EXPECT_EQ(IpAddress::AddrScope::GLOBAL_SCOPE, ip5.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::GLOBAL_SCOPE, ip6.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::HOST_SCOPE, ip7.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::MCAST_SCOPE, ip8.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::MCAST_SCOPE, ip9.getAddrScope());

EXPECT_EQ(IpAddress::AddrScope::GLOBAL_SCOPE, ip11.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::LINK_SCOPE, ip12.getAddrScope());
Expand All @@ -71,4 +77,6 @@ TEST(IpAddress, getAddrScope)
EXPECT_EQ(IpAddress::AddrScope::LINK_SCOPE, ip16.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::GLOBAL_SCOPE, ip17.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::HOST_SCOPE, ip18.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::MCAST_SCOPE, ip19.getAddrScope());
EXPECT_EQ(IpAddress::AddrScope::MCAST_SCOPE, ip20.getAddrScope());
}
31 changes: 31 additions & 0 deletions tests/ipprefix_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,3 +144,34 @@ TEST(IpPrefix, getSubnet)
EXPECT_EQ("2001:4898:f0::/45", prefix9.getSubnet().to_string());
EXPECT_EQ("2001:4898:f0:f153:357c:77b2:49c9:627c/128", prefix10.getSubnet().to_string());
}

TEST(IpPrefix, maskLen)
{
IpPrefix prefix1("0.0.0.0/0");
IpPrefix prefix2("1.1.1.1/24");
IpPrefix prefix3("1.1.1.1/32");
IpPrefix prefix4("::/0");
IpPrefix prefix5("2001:4898:f0:f153:357c:77b2:49c9:627c/64");
IpPrefix prefix6("2001:4898:f0:f153:357c:77b2:49c9:627c/128");

EXPECT_TRUE(prefix1.isDefaultRoute());
EXPECT_FALSE(prefix2.isDefaultRoute());
EXPECT_FALSE(prefix3.isDefaultRoute());
EXPECT_TRUE(prefix4.isDefaultRoute());
EXPECT_FALSE(prefix5.isDefaultRoute());
EXPECT_FALSE(prefix6.isDefaultRoute());

EXPECT_FALSE(prefix1.isFullMask());
EXPECT_FALSE(prefix2.isFullMask());
EXPECT_TRUE(prefix3.isFullMask());
EXPECT_FALSE(prefix4.isFullMask());
EXPECT_FALSE(prefix5.isFullMask());
EXPECT_TRUE(prefix6.isFullMask());

EXPECT_EQ(0, prefix1.getMaskLength());
EXPECT_EQ(24, prefix2.getMaskLength());
EXPECT_EQ(32, prefix3.getMaskLength());
EXPECT_EQ(0, prefix4.getMaskLength());
EXPECT_EQ(64, prefix5.getMaskLength());
EXPECT_EQ(128, prefix6.getMaskLength());
}