stubbfel/1261Nat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix calc of arp hash value

Browse Source
This commit is contained in:
stubbfel
2017-06-08 21:38:27 +02:00
parent d202fdc778
commit c0b8a1b5e0
8 changed files with 78 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/ArpToNdpPacketHandler.cpp
View File

@@ -61,12 +61,14 @@ bool ArpToNdpPacketHandler::handle(IN const Tins::PDU & pdu, IN IPacketHandler *
ndpPdu->source_link_layer_addr(senderHwAddr);
ndpPdu->target_addr(*targetIp6Address);
isRequest = true;
ipv6Pdu->hop_limit(255);
break;
case Tins::ARP::REPLY:
ndpPdu = std::make_unique<Tins::ICMPv6>(Tins::ICMPv6::NEIGHBOUR_ADVERT);
ipv6Pdu->dst_addr(*targetIp6Address);
ndpPdu->target_addr(*senderIp6Address);
ipv6Pdu->hop_limit(255);
ndpPdu->target_link_layer_addr(senderHwAddr);
break;
default:

5
src/Icmp4ToIcmp6PacketHandler.cpp
View File

@@ -47,6 +47,11 @@ bool Icmp4ToIcmp6PacketHandler::handle(IN const Tins::PDU & pdu, IN IPacketHandl
icmpv6Pdu->sequence(icmpv4Pdu->sequence());
icmpv6Pdu->code(0);
if (icmpv4Pdu->inner_pdu() != nullptr)
{
icmpv6Pdu->inner_pdu(icmpv4Pdu->inner_pdu()->clone());
}
// replace icmp4 with icmp6 content, adress translation will bo den by Ip4ToIp6PacketHandler
Tins::PDU * clonePdu = pdu.clone();
Tins::IP * ipPdu = clonePdu->find_pdu<Tins::IP>();

6
src/Icmp6ToIcmp4PacketHandler.cpp
View File

@@ -53,6 +53,11 @@ bool Icmp6ToIcmp4PacketHandler::handle(IN const Tins::PDU & pdu, IN IPacketHandl
icmpv4Pdu->sequence(icmpv6Pdu->sequence());
icmpv4Pdu->code(0);
if (icmpv6Pdu->inner_pdu() != nullptr)
{
icmpv4Pdu->inner_pdu(icmpv6Pdu->inner_pdu()->clone());
}
// replace icmp4 with icmp6 content, adress translation will bo den by Ip4ToIp6PacketHandler
Tins::PDU * clonePdu = pdu.clone();
Tins::IPv6 * ipv6Pdu = clonePdu->find_pdu<Tins::IPv6>();
@@ -61,6 +66,7 @@ bool Icmp6ToIcmp4PacketHandler::handle(IN const Tins::PDU & pdu, IN IPacketHandl
return false;
}
ipv6Pdu->inner_pdu(*icmpv4Pdu);
return Ip6ToIp4PacketHandler::handle(*clonePdu, callBackHandler);
}

4
src/Ip4ToIp6PacketHandler.cpp
View File

@@ -36,7 +36,9 @@ bool Ip4ToIp6PacketHandler::handle(IN const Tins::PDU & pdu, IN IPacketHandler *
IpAddressTranslator::toIpv6Address(ipv4Pdu->dst_addr(), *dstIp6Address);
// create ip4 pdu
std::unique_ptr<const Tins::IPv6> ipv6Pdu = std::make_unique<const Tins::IPv6>(*dstIp6Address,*srcIp6Address);
std::unique_ptr<Tins::IPv6> ipv6Pdu = std::make_unique<Tins::IPv6>(*dstIp6Address,*srcIp6Address);
ipv6Pdu->hop_limit(64);
ipv6Pdu->flow_label(11);
// create forwarding frame
std::unique_ptr<Tins::EthernetII> ptrForwardEthPdu = std::make_unique<Tins::EthernetII>();

31
src/TinsNetworkInterfaceCard.cpp
View File

@@ -1,6 +1,7 @@
#include "TinsNetworkInterfaceCard.h"
#include <functional>
#include <mutex>
#include <tins/arp.h>
#include <tins/ethernetII.h>
#include <tins/network_interface.h>
#include <tins/packet_sender.h>
@@ -48,7 +49,25 @@ TinsNetworkInterfaceCard::~TinsNetworkInterfaceCard()
stopListen();
}
bool TinsNetworkInterfaceCard::handle(const Tins::PDU &pdu, IPacketHandler *callBackHandler)
std::size_t TinsNetworkInterfaceCard::calcHashValue(Tins::PDU & phyLayerLessPdu)
{
const Tins::ARP * arpPdu = phyLayerLessPdu.find_pdu<Tins::ARP>();
ByteVector byteVector;
if(arpPdu != nullptr)
{
Tins::ARP arpNorm(arpPdu->target_ip_addr(), arpPdu->sender_ip_addr());
byteVector = arpNorm.serialize();
}
else
{
byteVector = phyLayerLessPdu.serialize();
}
const std::size_t byteVectorHashValue = byteVectorHash(byteVector);
return byteVectorHashValue;
}
bool TinsNetworkInterfaceCard::handle(const Tins::PDU &pdu, IPacketHandler * /*callBackHandler*/)
{
if (!isSnifferRunning)
{
@@ -63,9 +82,8 @@ bool TinsNetworkInterfaceCard::handle(const Tins::PDU &pdu, IPacketHandler *call
//was the pdu sent by me?
Tins::PDU * phyLayerLessPdu = getPhyLessPduPtr(*clonePdu);
const ByteVector byteVector = phyLayerLessPdu->serialize();
const std::size_t byteVectorHashValue = calcHashValue(*phyLayerLessPdu);
delete clonePdu;
const std::size_t byteVectorHashValue = byteVectorHash(byteVector);
if(searchAndRemoveHashListItem(byteVectorHashValue))
{
return true;
@@ -93,8 +111,12 @@ void TinsNetworkInterfaceCard::sendPacket(const Tins::PDU &pdu)
if (phyLayerLessPdu != nullptr)
{
addPduToHashList(*phyLayerLessPdu);
printf("len: %u, type: %s \n", clonePduRef.size(), typeid(clonePduRef).name());
if (clonePduRef.size() < 1500)
{
packetSender->send(clonePduRef);
}
}
delete clonePdu;
}
@@ -106,8 +128,7 @@ void TinsNetworkInterfaceCard::addPduToHashList(IN Tins::PDU &pdu)
return;
}
const ByteVector byteVector = pdu.serialize();
const std::size_t byteVectorHashValue = byteVectorHash(byteVector);
const std::size_t byteVectorHashValue = calcHashValue(pdu);
std::lock_guard<std::mutex> lockGuard(*hashListMutex);
sendPduHashList->push_back(byteVectorHashValue);
}

3
src/TinsNetworkInterfaceCard.h
View File

@@ -20,7 +20,7 @@ public:
virtual ~TinsNetworkInterfaceCard();
virtual bool handle(IN const Tins::PDU & pdu, IN IPacketHandler * callBackHandler = nullptr) override;
virtual bool handle(IN const Tins::PDU & pdu, IN IPacketHandler * = nullptr) override;
virtual void sendPacket(IN const Tins::PDU & pdu) override;
virtual void startListen() override;
virtual void stopListen() override;
@@ -44,5 +44,6 @@ private:
std::atomic<bool> isSnifferRunning;
SPtrIPacketHandlerList handlerList;
std::string sniffNetworkInterfaceName;
static std::size_t calcHashValue(Tins::PDU & phyLayerLessPdu);
};
#endif

4
test/src/TestIp6ToIp4PacketHandler.cpp
View File

@@ -20,6 +20,7 @@ namespace TestIp6ToIp4PacketHandler
{
REQUIRE(currentInputPdu != nullptr);
REQUIRE(answerPdu.find_pdu<Tins::IPv6>() == nullptr);
REQUIRE(answerPdu.find_pdu<Tins::TCP>() != nullptr);
const Tins::IP * ip = answerPdu.find_pdu<Tins::IP>();
REQUIRE(ip != nullptr);
@@ -51,7 +52,8 @@ TEST_CASE( "test Ip6ToIp4PacketHandler", "[Ip6ToIp4PacketHandler]" ) {
return true;
});
Tins::EthernetII pkt = Tins::EthernetII() / Tins::IPv6() / Tins::TCP();
Tins::IPv6 tmpPkt = Tins::IPv6() / Tins::TCP();
Tins::EthernetII pkt = Tins::EthernetII() / tmpPkt;
TestIp6ToIp4PacketHandler::currentInputPdu = &pkt;
REQUIRE(handler.handle(pkt, nullptr) == false);
REQUIRE(handler.handle(pkt, &mockHandler.get()) == true);

23
test/src/TestTinsNetworkCard.cpp
View File

@@ -1,7 +1,8 @@
#include "fakeit.hpp"
#include <chrono>
#include <thread>
#include "tins/ethernetII.h"
#include <tins/arp.h>
#include <tins/ethernetII.h>
#include <tins/ip.h>
#include <tins/ipv6.h>
#include <tins/ip_address.h>
@@ -27,6 +28,15 @@ namespace TestTinsNetworkInterfaceCard
if(ip1 != nullptr && (ip1->dst_addr() == ip2->dst_addr()))
{
foundPduCount++;
return true;
}
const Tins::ARP * arp1 = pdu.find_pdu<Tins::ARP>();
const Tins::ARP * arp2 = currentInputPdu->find_pdu<Tins::ARP>();
if(arp1 != nullptr && (arp1->target_ip_addr() == arp2->target_ip_addr()))
{
foundPduCount++;
return true;
}
return true;
@@ -80,4 +90,15 @@ TEST_CASE( "test send and receive Packet", "[TinsNetworkInterfaceCard_SendRec]"
ptrPacketSniffer->stopListen();
sniffThread3.join();
REQUIRE(TestTinsNetworkInterfaceCard::foundPduCount == 4);
pkt = Tins::ARP::make_arp_request("1.2.3.4", "4.3.2.1", "11:22:33:44:55:66");
std::thread sniffThread4(&TinsNetworkInterfaceCard::startListen, ptrPacketSniffer.get());
std::this_thread::sleep_for(std::chrono::seconds(2));
ptrPacketSniffer->sendPacket(pkt);
ptrPacketSender->sendPacket(pkt);
ptrPacketSniffer->sendPacket(pkt);
std::this_thread::sleep_for(std::chrono::seconds(2));
ptrPacketSniffer->stopListen();
sniffThread4.join();
REQUIRE(TestTinsNetworkInterfaceCard::foundPduCount == 5);
}