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

Fix compilation warnings on Windows x64.

Browse Source
This commit is contained in:
Matias Fontanini
2015-05-17 17:30:54 -07:00
parent 5cd0c8e41b
commit c42cd0114f
47 changed files with 167 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/src/allocators.cpp
View File

@@ -50,7 +50,7 @@ public:
DummyPDU(const uint8_t* data, uint32_t sz) : buffer(data, data + sz) { }
DummyPDU *clone() const { return new DummyPDU<n>(*this); }
uint32_t header_size() const { return buffer.size(); }
uint32_t header_size() const { return (uint32_t)buffer.size(); }
PDUType pdu_type() const { return pdu_flag; }
void write_serialization(uint8_t *data, uint32_t, const PDU *)
{
@@ -75,22 +75,22 @@ TEST_F(AllocatorsTest, LinkLayerPDUs) {
link_layer_data_buffer + sizeof(link_layer_data_buffer)
);
{
EthernetII pkt(&link_layer_data[0], link_layer_data.size());
EthernetII pkt(&link_layer_data[0], (uint32_t)link_layer_data.size());
EXPECT_TRUE(pkt.find_pdu<DummyPDU<0> >() != NULL);
EXPECT_EQ(pkt.serialize(), link_layer_data);
}
{
SNAP pkt(&link_layer_data[0], link_layer_data.size());
SNAP pkt(&link_layer_data[0], (uint32_t)link_layer_data.size());
EXPECT_TRUE(pkt.find_pdu<DummyPDU<1> >() != NULL);
EXPECT_EQ(pkt.serialize(), link_layer_data);
}
{
Dot1Q pkt(&link_layer_data[0], link_layer_data.size());
Dot1Q pkt(&link_layer_data[0], (uint32_t)link_layer_data.size());
EXPECT_TRUE(pkt.find_pdu<DummyPDU<2> >() != NULL);
EXPECT_EQ(pkt.serialize(), link_layer_data);
}
{
SLL pkt(&link_layer_data[0], link_layer_data.size());
SLL pkt(&link_layer_data[0], (uint32_t)link_layer_data.size());
EXPECT_TRUE(pkt.find_pdu<DummyPDU<3> >() != NULL);
EXPECT_EQ(pkt.serialize(), link_layer_data);
}
@@ -102,7 +102,7 @@ TEST_F(AllocatorsTest, IP) {
ipv4_data_buffer + sizeof(ipv4_data_buffer)
);
Allocators::register_allocator<IP, DummyPDU<0> >(255);
EthernetII pkt(&ipv4_data[0], ipv4_data.size());
EthernetII pkt(&ipv4_data[0], (uint32_t)ipv4_data.size());
EXPECT_TRUE(pkt.find_pdu<IP>() != NULL);
EXPECT_TRUE(pkt.find_pdu<DummyPDU<0> >() != NULL);
EXPECT_EQ(pkt.serialize(), ipv4_data);
@@ -115,7 +115,7 @@ TEST_F(AllocatorsTest, IPv6) {
);
Allocators::register_allocator<IPv6, DummyPDU<0> >(250);
{
EthernetII pkt(&ipv6_data[0], ipv6_data.size());
EthernetII pkt(&ipv6_data[0], (uint32_t)ipv6_data.size());
EXPECT_TRUE(pkt.find_pdu<IPv6>() != NULL);
EXPECT_TRUE(pkt.find_pdu<DummyPDU<0> >() != NULL);
EXPECT_EQ(pkt.serialize(), ipv6_data);

2
tests/src/arp.cpp
View File

@@ -152,7 +152,7 @@ TEST_F(ARPTest, ConstructorFromBuffer) {
ARP arp1(expected_packet, sizeof(expected_packet));
PDU::serialization_type buffer = arp1.serialize();
ARP arp2(&buffer[0], buffer.size());
ARP arp2(&buffer[0], (uint32_t)buffer.size());
EXPECT_EQ(arp1.opcode(), arp2.opcode());
ASSERT_EQ(arp1.hw_addr_length(), arp2.hw_addr_length());
EXPECT_EQ(arp1.hw_addr_format(), arp2.hw_addr_format());

2
tests/src/dhcp.cpp
View File

@@ -301,7 +301,7 @@ TEST_F(DHCPTest, Serialize) {
ASSERT_EQ(buffer.size(), sizeof(expected_packet));
EXPECT_TRUE(std::equal(buffer.begin(), buffer.end(), expected_packet));
DHCP dhcp2(&buffer[0], buffer.size());
DHCP dhcp2(&buffer[0], (uint32_t)buffer.size());
test_equals(dhcp1, dhcp2);
}

6
tests/src/dhcpv6.cpp
View File

@@ -283,7 +283,7 @@ TEST_F(DHCPv6Test, Client_Server_ID_DUIDLL) {
data.lladdress.push_back(209);
dhcp.client_id(data);
tmp = dhcp.client_id();
output = DHCPv6::duid_ll::from_bytes(&tmp.data[0], tmp.data.size());
output = DHCPv6::duid_ll::from_bytes(&tmp.data[0], (uint32_t)tmp.data.size());
EXPECT_EQ(data.hw_type, output.hw_type);
EXPECT_EQ(data.lladdress, output.lladdress);
@@ -304,7 +304,7 @@ TEST_F(DHCPv6Test, Client_Server_ID_DUIDLLT) {
data.lladdress.push_back(209);
dhcp.client_id(data);
tmp = dhcp.client_id();
output = DHCPv6::duid_llt::from_bytes(&tmp.data[0], tmp.data.size());
output = DHCPv6::duid_llt::from_bytes(&tmp.data[0], (uint32_t)tmp.data.size());
EXPECT_EQ(data.hw_type, output.hw_type);
EXPECT_EQ(data.time, output.time);
EXPECT_EQ(data.lladdress, output.lladdress);
@@ -325,7 +325,7 @@ TEST_F(DHCPv6Test, Client_Server_ID_DUIDEN) {
data.identifier.push_back(209);
dhcp.client_id(data);
tmp = dhcp.client_id();
output = DHCPv6::duid_en::from_bytes(&tmp.data[0], tmp.data.size());
output = DHCPv6::duid_en::from_bytes(&tmp.data[0], (uint32_t)tmp.data.size());
EXPECT_EQ(data.enterprise_number, output.enterprise_number);
EXPECT_EQ(data.identifier, output.identifier);

2
tests/src/icmp.cpp
View File

@@ -282,7 +282,7 @@ TEST_F(ICMPTest, ConstructorFromBuffer) {
break;
}
ICMP icmp2(&buffer[0], buffer.size());
ICMP icmp2(&buffer[0], (uint32_t)buffer.size());
test_equals(icmp1, icmp2);
}
}

6
tests/src/ip.cpp
View File

@@ -662,15 +662,15 @@ TEST_F(IPTest, ConstructorFromBuffer) {
TEST_F(IPTest, StackedProtocols) {
IP ip = IP() / TCP();
IP::serialization_type buffer = ip.serialize();
EXPECT_TRUE(IP(&buffer[0], buffer.size()).find_pdu<TCP>() != NULL);
EXPECT_TRUE(IP(&buffer[0], (uint32_t)buffer.size()).find_pdu<TCP>() != NULL);
ip = IP() / UDP();
buffer = ip.serialize();
EXPECT_TRUE(IP(&buffer[0], buffer.size()).find_pdu<UDP>() != NULL);
EXPECT_TRUE(IP(&buffer[0], (uint32_t)buffer.size()).find_pdu<UDP>() != NULL);
ip = IP() / ICMP();
buffer = ip.serialize();
EXPECT_TRUE(IP(&buffer[0], buffer.size()).find_pdu<ICMP>() != NULL);
EXPECT_TRUE(IP(&buffer[0], (uint32_t)buffer.size()).find_pdu<ICMP>() != NULL);
}
TEST_F(IPTest, SpoofedOptions) {

2
tests/src/ip_reassembler.cpp
View File

@@ -45,7 +45,7 @@ const size_t IPv4ReassemblerTest::orderings[][11] = {
void IPv4ReassemblerTest::test_packets(const std::vector<std::pair<const uint8_t*, size_t> > &vt) {
IPv4Reassembler reassembler;
for(size_t i = 0; i < vt.size(); ++i) {
EthernetII eth(vt[i].first, vt[i].second);
EthernetII eth(vt[i].first, (uint32_t)vt[i].second);
IPv4Reassembler::packet_status status = reassembler.process(eth);
EXPECT_NE(IPv4Reassembler::NOT_FRAGMENTED, status);
if(status == IPv4Reassembler::REASSEMBLED) {

2
tests/src/ipv6.cpp
View File

@@ -123,7 +123,7 @@ TEST_F(IPv6Test, Serialize) {
IPv6::serialization_type(expected_packet1, expected_packet1 + sizeof(expected_packet1)),
buffer
);
IPv6 ip2(&buffer[0], buffer.size());
IPv6 ip2(&buffer[0], (uint32_t)buffer.size());
test_equals(ip1, ip2);
}

4
tests/src/pppoe.cpp
View File

@@ -87,7 +87,7 @@ TEST_F(PPPoETest, ConstructorFromBuffer) {
TEST_F(PPPoETest, StackedOnEthernet) {
EthernetII eth = EthernetII() / PPPoE();
PDU::serialization_type buffer = eth.serialize();
EthernetII eth2(&buffer[0], buffer.size());
EthernetII eth2(&buffer[0], (uint32_t)buffer.size());
ASSERT_TRUE(eth2.find_pdu<PPPoE>() != NULL);
}
@@ -95,7 +95,7 @@ TEST_F(PPPoETest, StackedOnEthernetSerializationWithTags) {
PPPoE pdu(expected_packet, sizeof(expected_packet));
EthernetII eth = EthernetII() / pdu;
PDU::serialization_type buffer = eth.serialize();
EthernetII eth2(&buffer[0], buffer.size());
EthernetII eth2(&buffer[0], (uint32_t)buffer.size());
PPPoE* unserialized = eth2.find_pdu<PPPoE>();
ASSERT_TRUE(unserialized != NULL);
EXPECT_EQ(

2
tests/src/rsn_eapol.cpp
View File

@@ -168,7 +168,7 @@ TEST_F(RSNEAPOLTest, ConstructionTest) {
RSNEAPOL::serialization_type buffer = eapol.serialize();
ASSERT_EQ(sizeof(expected_packet), buffer.size());
RSNEAPOL eapol2(&buffer[0], buffer.size());
RSNEAPOL eapol2(&buffer[0], (uint32_t)buffer.size());
test_equals(eapol, eapol2);
EXPECT_TRUE(std::equal(buffer.begin(), buffer.end(), expected_packet));

2
tests/src/snap.cpp
View File

@@ -104,7 +104,7 @@ TEST_F(SNAPTest, ConstructorFromBuffer) {
EXPECT_EQ(0x0800, snap1.eth_type());
EXPECT_EQ(1U, snap1.org_code());
SNAP snap2(&buffer[0], buffer.size());
SNAP snap2(&buffer[0], (uint32_t)buffer.size());
test_equals(snap1, snap2);
}

4
tests/src/tcp.cpp
View File

@@ -51,7 +51,7 @@ TEST_F(TCPTest, ChecksumCheck) {
uint16_t checksum = tcp1.checksum();
PDU::serialization_type buffer = pkt1.serialize();
EthernetII pkt2(&buffer[0], buffer.size());
EthernetII pkt2(&buffer[0], (uint32_t)buffer.size());
const TCP &tcp2 = pkt2.rfind_pdu<TCP>();
EXPECT_EQ(checksum, tcp2.checksum());
EXPECT_EQ(tcp1.checksum(), tcp2.checksum());
@@ -231,7 +231,7 @@ TEST_F(TCPTest, ConstructorFromBuffer) {
PDU::serialization_type buffer = tcp1.serialize();
TCP tcp2(&buffer[0], buffer.size());
TCP tcp2(&buffer[0], (uint32_t)buffer.size());
test_equals(tcp1, tcp2);
}

4
tests/src/udp.cpp
View File

@@ -51,7 +51,7 @@ TEST_F(UDPTest, ChecksumCheck) {
uint16_t checksum = udp1.checksum();
PDU::serialization_type buffer = pkt1.serialize();
EthernetII pkt2(&buffer[0], buffer.size());
EthernetII pkt2(&buffer[0], (uint32_t)buffer.size());
const UDP &udp2 = pkt2.rfind_pdu<UDP>();
EXPECT_EQ(checksum, udp2.checksum());
EXPECT_EQ(udp1.checksum(), udp2.checksum());
@@ -141,7 +141,7 @@ TEST_F(UDPTest, ConstructorFromBuffer) {
EXPECT_EQ(udp1.sport(), 0xf51a);
EXPECT_EQ(udp1.length(), 8);
UDP udp2(&buffer[0], buffer.size());
UDP udp2(&buffer[0], (uint32_t)buffer.size());
EXPECT_EQ(udp1.dport(), udp2.dport());
EXPECT_EQ(udp1.sport(), udp2.sport());
EXPECT_EQ(udp1.length(), udp2.length());