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

add hw adress translator, add solicitedNodeAddress traslation , finisched arp to ndp handler

Browse Source
This commit is contained in:
stubbfel
2017-02-16 00:47:27 +01:00
parent 7e7e66f0b7
commit 9b65fca64a
9 changed files with 140 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
src/ArpToNdpPacketHandler.cpp
View File

@@ -6,19 +6,26 @@
#include <tins/ipv6.h>
#include <tins/ip_address.h>
#include <tins/ipv6_address.h>
#include "HwAddressTranslator.h"
#include "IpAddressTranslator.h"
ArpToNdpPacketHandler::ArpToNdpPacketHandler(const Tins::IPv6Address & newPrefix)
{
prefix = std::make_unique<Tins::IPv6Address>(newPrefix);
ndpPrefix = std::make_unique<Tins::IPv6Address>("FF02:0:0:0:0:1:FF");
ndpMask = std::make_unique<Tins::IPv4Address>("255.0.0.0");
}
ArpToNdpPacketHandler::~ArpToNdpPacketHandler()
{
}
void ArpToNdpPacketHandler::setSolicitedNodeAddress(INOUT Tins::IPv6 & ipv6, IN const Tins::IPv6Address & targetIp)
{
UPtrIPv6Address solicitedNodeAddress = std::make_unique<Tins::IPv6Address>();
Tins::IPv6Address & tmpRef = *solicitedNodeAddress;
IpAddressTranslator::toSolicitedNodeAddress(targetIp, tmpRef);
ipv6.dst_addr(tmpRef);
}
bool ArpToNdpPacketHandler::handle(IN const Tins::PDU & pdu, IN IPacketHandler * callBackHandler)
{
// callback handvet requeried
@@ -35,50 +42,69 @@ bool ArpToNdpPacketHandler::handle(IN const Tins::PDU & pdu, IN IPacketHandler *
}
// convert ipv4 addresses to ipv6 addresses
UPtrIPv6Address srcIp6Address = std::make_unique<Tins::IPv6Address>(*prefix);
UPtrIPv6Address senderIp6Address = std::make_unique<Tins::IPv6Address>(*prefix);
UPtrIPv6Address targetIp6Address = std::make_unique<Tins::IPv6Address>(*prefix);
IpAddressTranslator::toIpv6Address(arpPdu->sender_ip_addr(), *srcIp6Address);
IpAddressTranslator::toIpv6Address(arpPdu->target_ip_addr(), *targetIp6Address);
// create ip4 pdu
std::unique_ptr<const Tins::IPv6> ipv6Pdu = std::make_unique<const Tins::IPv6>((*targetIp6Address)|(*ndpPrefix),*srcIp6Address);
std::unique_ptr<Tins::ICMPv6> ndpPdu;
const Tins::IPv4Address & targetIp =arpPdu->target_ip_addr();
IpAddressTranslator::toIpv6Address(arpPdu->sender_ip_addr(), *senderIp6Address);
IpAddressTranslator::toIpv6Address(targetIp, *targetIp6Address);
// create ip4 pdu
std::unique_ptr<Tins::ICMPv6> ndpPdu;
std::shared_ptr<Tins::IPv6> ipv6Pdu = std::make_shared<Tins::IPv6>();
ipv6Pdu->src_addr(*senderIp6Address);
bool isRequest = false;
const Tins::ARP::hwaddress_type & senderHwAddr = arpPdu->sender_hw_addr();
switch (arpPdu->opcode())
{
case Tins::ARP::REQUEST:
ndpPdu = std::make_unique<Tins::ICMPv6>(Tins::ICMPv6::NEIGHBOUR_SOLICIT);
setSolicitedNodeAddress(*ipv6Pdu, *targetIp6Address);
ndpPdu->source_link_layer_addr(senderHwAddr);
ndpPdu->target_addr(*targetIp6Address);
isRequest = true;
break;
case Tins::ARP::REPLY:
ndpPdu = std::make_unique<Tins::ICMPv6>(Tins::ICMPv6::NEIGHBOUR_ADVERT);
ipv6Pdu->dst_addr(*targetIp6Address);
ndpPdu->target_addr(*senderIp6Address);
ndpPdu->target_link_layer_addr(senderHwAddr);
break;
default:
return false;
}
ndpPdu->target_addr(*targetIp6Address);
// create forwarding frame
std::unique_ptr<Tins::EthernetII> ptrForwardEthPdu = std::make_unique<Tins::EthernetII>();
Tins::EthernetII & forwardEthPdu = *ptrForwardEthPdu;
// copy src and dst mac address
std::shared_ptr<Tins::PDU> ptrOutestPdu;
const Tins::EthernetII * ethPdu = pdu.find_pdu<Tins::EthernetII>();
if(ethPdu != nullptr)
{
// @todo to set multicast
forwardEthPdu.src_addr(ethPdu->src_addr());
Tins::IPv4Address foo =arpPdu->target_ip_addr();
std::string string("hello $name");
Tins::EthernetII::address_type ethernatMask = std::regex_replace("00:00:" + foo.to_string(), std::regex("."), ":");
Tins::EthernetII::address_type ethernatMask2 = "33:33:FF:00:00:00";
forwardEthPdu.dst_addr(ethernatMask | ethernatMask2);
// set eth frame
std::shared_ptr<Tins::EthernetII> ptrEthPdu = std::make_shared<Tins::EthernetII>();
ptrEthPdu->src_addr(ethPdu->src_addr());
Tins::EthernetII::address_type dstMac;
if (isRequest)
{
// set solicited address
UPtrHwAddress solicitedNodeHWAddress = std::make_unique<HwAddress>();
HwAddressTranslator::toSolicitedNodeAddress(*targetIp6Address, *solicitedNodeHWAddress);
ptrEthPdu->dst_addr(*solicitedNodeHWAddress);
}
else
{
ptrEthPdu->dst_addr(ethPdu->dst_addr());
}
ptrOutestPdu = ptrEthPdu;
*ptrOutestPdu /= *ipv6Pdu;
}
else
{
ptrOutestPdu = ipv6Pdu;
}
forwardEthPdu /= *ipv6Pdu;
forwardEthPdu /= *ndpPdu;
// forward frame
return callBackHandler->handle(forwardEthPdu, this);
Tins::PDU & outestPdu = *ptrOutestPdu;
outestPdu /= *ndpPdu;
return callBackHandler->handle(outestPdu, this);
}
const Tins::IPv6Address & ArpToNdpPacketHandler::getPrefix() const