3rd-party/libtins
1
0
Fork 0
mirror of https://github.com/mfontanini/libtins synced 2026-01-29 04:54:28 +01:00
Code Issues Releases Wiki Activity

RAII'd some code. Everything(hopefully) uses IPv4Address now.

Browse Source
This commit is contained in:
Matias Fontanini
2012-08-27 00:16:56 -03:00
parent 1b08d1af71
commit da8c77c77e
20 changed files with 206 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/src/arp.cpp
View File

@@ -141,7 +141,7 @@ TEST_F(ARPTest, Opcode) {
}
TEST_F(ARPTest, Serialize) {
ARP arp1(0x1234, 0xa3f1, hw_addr1, hw_addr2);
ARP arp1("192.168.0.1", "192.168.0.100", hw_addr1, hw_addr2);
PDU::serialization_type buffer = arp1.serialize();

26
tests/src/ip.cpp
View File

@@ -24,8 +24,8 @@ const uint8_t IPTest::expected_packet[] = { '(', '\x7f', '\x00', ' ',
TEST_F(IPTest, DefaultConstructor) {
IP ip;
EXPECT_EQ(ip.dst_addr(), IPv4Address());
EXPECT_EQ(ip.src_addr(), IPv4Address());
EXPECT_EQ(ip.dst_addr(), 0);
EXPECT_EQ(ip.src_addr(), 0);
EXPECT_EQ(ip.version(), 4);
EXPECT_EQ(ip.id(), 1);
EXPECT_EQ(ip.pdu_type(), PDU::IP);
@@ -53,9 +53,9 @@ TEST_F(IPTest, NestedCopy) {
}
TEST_F(IPTest, IPIntConstructor) {
IP ip(0x23abcdef, 0xff1443ab);
EXPECT_EQ(ip.dst_addr(), IPv4Address(0x23abcdef));
EXPECT_EQ(ip.src_addr(), IPv4Address(0xff1443ab));
IP ip("192.168.0.1", "192.168.0.100");
EXPECT_EQ(ip.dst_addr(), "192.168.0.1");
EXPECT_EQ(ip.src_addr(), "192.168.0.100");
EXPECT_EQ(ip.version(), 4);
EXPECT_EQ(ip.id(), 1);
}
@@ -63,8 +63,8 @@ TEST_F(IPTest, IPIntConstructor) {
TEST_F(IPTest, IPStringConstructor) {
string ip1 = "154.33.200.55", ip2 = "192.10.11.52";
IP ip(ip1, ip2);
EXPECT_EQ(ip.dst_addr(), IPv4Address(ip1));
EXPECT_EQ(ip.src_addr(), IPv4Address(ip2));
EXPECT_EQ(ip.dst_addr(), ip1);
EXPECT_EQ(ip.src_addr(), ip2);
EXPECT_EQ(ip.version(), 4);
EXPECT_EQ(ip.id(), 1);
}
@@ -133,14 +133,14 @@ TEST_F(IPTest, DstIPString) {
TEST_F(IPTest, SrcIPInt) {
IP ip;
ip.src_addr(0x7f137ab3);
EXPECT_EQ(ip.src_addr(), IPv4Address(0x7f137ab3));
ip.src_addr("192.155.32.10");
EXPECT_EQ(ip.src_addr(), "192.155.32.10");
}
TEST_F(IPTest, DstIPInt) {
IP ip;
ip.dst_addr(0x7f137ab3);
EXPECT_EQ(ip.dst_addr(), IPv4Address(0x7f137ab3));
ip.dst_addr("192.155.32.10");
EXPECT_EQ(ip.dst_addr(), "192.155.32.10");
}
TEST_F(IPTest, Version) {
@@ -174,8 +174,8 @@ TEST_F(IPTest, ConstructorFromBuffer) {
IP ip1(expected_packet, sizeof(expected_packet));
const uint8_t opt_sec[] = { 't', 'j', 'g', '\xab', 'w', '\xab', 'h', 'e', 'l' };
EXPECT_EQ(ip1.dst_addr(), IPv4Address ("192.168.9.43"));
EXPECT_EQ(ip1.src_addr(), IPv4Address("84.52.254.5"));
EXPECT_EQ(ip1.dst_addr(), "192.168.9.43");
EXPECT_EQ(ip1.src_addr(), "84.52.254.5");
EXPECT_EQ(ip1.id(), 0x7a);
EXPECT_EQ(ip1.tos(), 0x7f);
EXPECT_EQ(ip1.frag_off(), 0x43);

3
tests/src/ipaddress.cpp
View File

@@ -11,8 +11,9 @@ std::string ip_string("192.168.0.225");
TEST(IPAddressTest, Constructor) {
IPv4Address addr1(ip_string);
IPv4Address addr2(Utils::ip_to_int(ip_string));
IPv4Address addr2(ip_string);
EXPECT_EQ(addr2, addr1);
EXPECT_EQ(addr1.to_string(), ip_string);
EXPECT_EQ(addr2.to_string(), ip_string);
EXPECT_NE(addr1, "192.168.0.254");
}