3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-23 02:35:57 +01:00
Code Issues Releases Wiki Activity

Add missing operators to address classes (#275)

Browse Source 
* * add or-operator and a simlple unit test for hw_address, ip_address, ipv6_address
* add not-operator and a simlple unit test for hw_address, ip_address, ipv6_address
* add greater-then-operator and a simlple unit test for ipv6_address
* add new constructor and a simlple unit test for network_interface, which use a ipv6_address to find the nic
* add override the function gateway_from_ip for ipv6_address parameter (untested)

* change the ipv6_address in NotMaskAdress_Test, so that the expceted addresses are valid for the winsock api

* Delete CMakeLists.txt.user

* * add  <=, >, >= operator for HWAddress with tests

* add  <=, >, >= operator for IPv4Address with tests
* add  <=,>= operator for IPv6Address with tests

* refactoring the  & , |, ~ operator of ipv6_address to "regular" operator
This commit is contained in:
stubbfel
2018-03-29 05:44:28 +02:00
committed by Matias Fontanini
parent 7848e28b62
commit 342e2c77a7
14 changed files with 371 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
tests/src/hw_address_test.cpp
View File

@@ -52,6 +52,7 @@ TEST_F(HWAddressTest, LessThanOperator) {
HWAddress<6> bcast = "ff:ff:ff:ff:ff:ff";
EXPECT_LT(addr2, addr1);
EXPECT_LT(addr2, bcast);
EXPECT_LE(addr1, addr1);
std::map<HWAddress<6>, int> dict;
dict[addr1] = 12;
dict[addr2] = 15;
@@ -59,6 +60,20 @@ TEST_F(HWAddressTest, LessThanOperator) {
EXPECT_EQ(dict[addr2], 15);
}
TEST_F(HWAddressTest, GreaterThanOperator) {
HWAddress<6> addr1(byte_address), addr2(empty_addr);
HWAddress<6> bcast = "ff:ff:ff:ff:ff:ff";
EXPECT_GT(addr1, addr2);
EXPECT_GT(bcast, addr2);
EXPECT_GE(addr1, addr1);
std::map<HWAddress<6>, int> dict;
dict[addr1] = 12;
dict[addr2] = 15;
EXPECT_EQ(dict[addr1], 12);
EXPECT_EQ(dict[addr2], 15);
}
TEST_F(HWAddressTest, CopyConstructor) {
HWAddress<6> addr1(byte_address), addr2(addr1);
@@ -115,3 +130,18 @@ TEST_F(HWAddressTest, Mask) {
address_type("de:ad:be:ef:00:00") & address_type("ff:ff:ff:f0:00:00")
);
}
TEST_F(HWAddressTest, OrMask) {
typedef HWAddress<6> address_type;
EXPECT_EQ(
address_type("ff:ff:ff:ff:fe:be"),
address_type("de:ad:be:ef:fe:be") | address_type("ff:ff:ff:f0:00:00")
);
}
TEST_F(HWAddressTest, NotMask) {
typedef HWAddress<6> address_type;
EXPECT_EQ(
address_type("00:00:00:0f:ff:ff"), ~address_type("ff:ff:ff:f0:00:00")
);
}

31
tests/src/ip_address_test.cpp
View File

@@ -47,8 +47,19 @@ TEST(IPAddressTest, LessThanOperator) {
EXPECT_LT(addr1, "192.168.1.2");
EXPECT_LT(addr1, "192.168.0.226");
EXPECT_LT(addr1, "193.0.0.0");
EXPECT_LE(addr1, addr2);
}
TEST(IPAddressTest, GreaterThanOperator) {
IPv4Address addr1(ip_string), addr2(ip_string);
EXPECT_FALSE(addr1 < addr2);
EXPECT_GT(addr1, "192.167.1.2");
EXPECT_GT(addr1, "192.167.0.226");
EXPECT_GT(addr1, "191.0.0.0");
EXPECT_GE(addr1, addr2);
}
TEST(IPAddressTest, IsPrivate) {
EXPECT_TRUE(IPv4Address("192.168.0.1").is_private());
EXPECT_TRUE(IPv4Address("192.168.133.7").is_private());
@@ -112,6 +123,26 @@ TEST(IPAddressTest, Mask) {
);
}
TEST(IPAddressTest, OrMask) {
EXPECT_EQ(
IPv4Address("255.255.255.1"),
IPv4Address("192.168.100.1") | IPv4Address("255.255.255.0")
);
EXPECT_EQ(
IPv4Address("255.255.1.2"),
IPv4Address("192.255.1.2") | IPv4Address("255.128.0.0")
);
}
TEST(IPAddressTest, NotMask) {
EXPECT_EQ(
IPv4Address("0.0.0.255"), ~IPv4Address("255.255.255.0")
);
EXPECT_EQ(
IPv4Address("0.127.255.255"),~IPv4Address("255.128.0.0")
);
}
TEST(IPv4AddressTest, Size) {
EXPECT_EQ(4UL, IPv4Address("127.0.0.1").size());
EXPECT_EQ(4UL, IPv4Address().size());

35
tests/src/ipv6_address_test.cpp
View File

@@ -70,6 +70,14 @@ TEST(IPv6AddressTest, LessThanOperator) {
EXPECT_LT(IPv6Address("17f8::1"), IPv6Address("17f8:0::0:5"));
EXPECT_LT(IPv6Address("::1"), IPv6Address("::5"));
EXPECT_LT(IPv6Address("1::"), IPv6Address("2::"));
EXPECT_LE(IPv6Address("1::"), IPv6Address("1::"));
}
TEST(IPv6AddressTest, GreaterThanOperator) {
EXPECT_GT(IPv6Address("17f8:0::0:5"), IPv6Address("17f8::1"));
EXPECT_GT(IPv6Address("::5"), IPv6Address("::1"));
EXPECT_GT(IPv6Address("2::"), IPv6Address("1::"));
EXPECT_GE(IPv6Address("2::"), IPv6Address("2::"));
}
TEST(IPv6AddressTest, OutputOperator) {
@@ -124,6 +132,33 @@ TEST(IPv6AddressTest, MaskAddress) {
);
}
TEST(IPv6AddressTest, OrMaskAddress) {
EXPECT_EQ(
IPv6Address("ffff:ffff:adad:beef::"),
IPv6Address("deaf:beef:adad:beef::") | IPv6Address("ffff:ffff::")
);
EXPECT_EQ(
IPv6Address("ffff:ffef:adad:beef::"),
IPv6Address("deaf:beef:adad:beef::") | IPv6Address("ffff:ff00::")
);
EXPECT_EQ(
IPv6Address("ffff:feef:adad:beef::"),
IPv6Address("deaf:beef:adad:beef::") | IPv6Address("ffff:f000::")
);
EXPECT_EQ(
IPv6Address("ffff:feef:adad:beef::"),
IPv6Address("deaf:beef:adad:beef::") | IPv6Address("ffff:e000::")
);
}
TEST(IPv6AddressTest, NotMaskAddress) {
EXPECT_EQ(IPv6Address("::ffff:ffff:ffff:ffff:ffff:ffff"),~IPv6Address("ffff:ffff::"));
EXPECT_EQ(IPv6Address("::ff:ffff:ffff:ffff:ffff:ffff"),~IPv6Address("ffff:ffff:ff00::"));
EXPECT_EQ(IPv6Address("::fff:ffff:ffff:ffff:ffff:ffff"),~IPv6Address("ffff:ffff:f000::"));
EXPECT_EQ(IPv6Address("::1fff:ffff:ffff:ffff:ffff:ffff"),~IPv6Address("ffff:ffff:e000::"));
}
TEST(IPv6AddressTest, Size) {
EXPECT_EQ(16UL, IPv6Address("dead:beef::1").size());
EXPECT_EQ(16UL, IPv6Address().size());

2
tests/src/network_interface_test.cpp
View File

@@ -37,6 +37,8 @@ TEST_F(NetworkInterfaceTest, ConstructorFromString) {
TEST_F(NetworkInterfaceTest, ConstructorFromIp) {
NetworkInterface iface(IPv4Address("127.0.0.1"));
EXPECT_EQ(iface.name(), iface_name);
NetworkInterface i6face(IPv6Address("::1"));
EXPECT_EQ(i6face.name(), iface_name);
}
TEST_F(NetworkInterfaceTest, Id) {