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

add arp tests and fix insert trnaslate

Browse Source
This commit is contained in:
stubbfel
2015-09-02 23:32:23 +02:00
parent 7560b71e92
commit 5476f0ea56
4 changed files with 309 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

165
src/map/natmap.cpp
View File

@@ -6,17 +6,26 @@ namespace otonat {
}
NatMap::~NatMap() {
//dtor
ranges.clear();
transMap.clear();
reqIpMap.clear();
while (!incommingPduQueue.empty()){
incommingPduQueue.pop();
}
while (!outgoingPduQueue.empty()){
outgoingPduQueue.pop();
}
}
NatMap::NatMap(const NatMap& other) : ranges(other.ranges), arpMap(other.arpMap), transMap(other.transMap), reqIpMap(other.reqIpMap), incommingPduQueue(other.incommingPduQueue), outgoingPduQueue(other.outgoingPduQueue), zeroIp(other.zeroIp) {
NatMap::NatMap(const NatMap& other) : ranges(other.ranges), transMap(other.transMap), reqIpMap(other.reqIpMap), incommingPduQueue(other.incommingPduQueue), outgoingPduQueue(other.outgoingPduQueue), zeroIp(other.zeroIp) {
}
NatMap& NatMap::operator=(const NatMap& rhs) {
if (this == &rhs) return *this; // handle self assignment
ranges = rhs.ranges;
arpMap = rhs.arpMap;
transMap = rhs.transMap;
incommingPduQueue = rhs.incommingPduQueue;
outgoingPduQueue = rhs.outgoingPduQueue;
@@ -52,7 +61,7 @@ namespace otonat {
return false;
}
const Tins::IPv4Address & originDstIp = ip->dst_addr();
const Tins::IPv4Address originDstIp = ip->dst_addr();
if (!isIpInMyRanges(originDstIp)) {
return false;
}
@@ -81,13 +90,13 @@ namespace otonat {
}
}
void NatMap::TranslateIpPacket(Tins::IP * ip, const Tins::IPv4Address & transIp) {
void NatMap::TranslateIpPacket(Tins::IP * ip, const Tins::IPv4Address & transDstIp) {
// set translated dst address
ip->dst_addr(transIp);
ip->dst_addr(transDstIp);
// translate src adress
const Tins::IPv4Address & originSrc = ip->src_addr();
const Tins::IPv4Address originSrc = ip->src_addr();
IpAdressMap::const_iterator transIpIter = transMap.find(originSrc);
Tins::IPv4Address transSrcAttr;
@@ -95,13 +104,13 @@ namespace otonat {
// set translated src address
transSrcAttr = transIpIter->second;
} else {
transSrcAttr = InsertOrUdpateTranslateIpAddress(originSrc, transIp, ranges);
transSrcAttr = InsertOrUdpateTranslateIpAddress(originSrc, transDstIp, ranges);
}
ip->src_addr(transSrcAttr);
}
Tins::IPv4Address NatMap::InsertOrUdpateTranslateIpAddress(const Tins::IPv4Address & originIp, const Tins::IPv4Address & transIp, NatRangeList & rangeList) {
Tins::IPv4Address NatMap::InsertOrUdpateTranslateIpAddress(const Tins::IPv4Address & originIp, const Tins::IPv4Address & otherTransSameRangeIp, NatRangeList & rangeList) {
// calc translated ip address for first up and not same interfaces
for (NatRange & range : rangeList) {
// insert or update translated ip address
@@ -110,8 +119,8 @@ namespace otonat {
continue;
}
Tins::IPv4Range ipRange = range.calcIpRange(true);
if (!ipRange.contains(transIp)) {
const Tins::IPv4Range ipRange = range.calcIpRange(true);
if (!ipRange.contains(otherTransSameRangeIp)) {
continue;
}
@@ -123,28 +132,37 @@ namespace otonat {
Tins::IPv4Address NatMap::InsertOrUdpateTranslateIpAddress(const Tins::IPv4Address & originIp, const NatRange & range) {
// translated ip address
Tins::IPv4Address transAddr = range.mapIPv4Addres(originIp, false);
const Tins::IPv4Address transAddr = range.mapIPv4Addres(originIp, false);
// insert forward translation
transMap.insert(IPv4AddressEntry(originIp, transAddr));
InsertOrUdpateTranslateIpAddress(originIp, transAddr);
// insert or update backward translation
IpAdressMap::const_iterator transIpIter = transMap.find(transAddr);
if (transIpIter != transMap.end()) {
transMap[transAddr] = originIp;
} else {
transMap.insert(IPv4AddressEntry(transAddr, originIp));
}
InsertOrUdpateTranslateIpAddress(transAddr, originIp);
return transAddr;
}
void NatMap::InsertOrUdpateTranslateIpAddress(const Tins::IPv4Address & originIp, const Tins::IPv4Address & transIp) {
IpAdressMap::const_iterator transIpIter = transMap.find(transIp);
if (transIpIter != transMap.end()) {
transMap[transIp] = originIp;
} else {
transMap.insert(IPv4AddressEntry(transIp, originIp));
}
}
bool NatMap::handleArp(Tins::ARP * arp) {
if (isForMeOrFromMeArp(arp)) {
return false;
}
const Tins::IPv4Address & originDstIp = arp->target_ip_addr();
if (!isIpInMyRanges(originDstIp)) {
return false;
}
switch (arp->opcode()) {
case Tins::ARP::REQUEST:
return this->handleArpReq(arp);
@@ -155,11 +173,11 @@ namespace otonat {
}
}
bool NatMap::isForMeOrFromMeIp(const Tins::IP* ip) {
bool NatMap::isForMeOrFromMeIp(const Tins::IP* ip) const {
return isForMeOrFromMeIp(ip, ranges);
}
bool NatMap::isForMeOrFromMeArp(const Tins::ARP * arp) {
bool NatMap::isForMeOrFromMeArp(const Tins::ARP * arp) const {
Tins::IP fakeIp(arp->target_ip_addr(), arp->sender_ip_addr());
return isForMeOrFromMeIp(&fakeIp);
}
@@ -176,7 +194,7 @@ namespace otonat {
return false;
}
bool NatMap::isIpInMyRanges(const Tins::IPv4Address & ipAddr) {
bool NatMap::isIpInMyRanges(const Tins::IPv4Address & ipAddr) const {
return isIpInMyRanges(ipAddr, ranges);
}
@@ -191,71 +209,104 @@ namespace otonat {
}
bool NatMap::handleArpReq(Tins::ARP* arp) {
Tins::IPv4Address targetIp = arp->target_ip_addr();
const Tins::IPv4Address targetIp = arp->target_ip_addr();
IpAdressMap::const_iterator transTargetIpIter = this->transMap.find(targetIp);
if (transTargetIpIter == transMap.end()) {
SendTranslatedArpRequest(arp);
return false;
}
Tins::IPv4Address transTargetIp = transTargetIpIter->second;
const Tins::IPv4Address transTargetIp = transTargetIpIter->second;
arp->target_ip_addr(transTargetIp);
IpAdressMap::const_iterator transSenderIpIter = this->transMap.find(arp->sender_ip_addr());
if (transSenderIpIter != transMap.end()) {
arp->sender_ip_addr(transSenderIpIter->second);
return false;
}
return handleArpAndTranslateSenderIp(arp);
}
bool NatMap::handleArpReply(Tins::ARP* arp) {
return false;
const Tins::IPv4Address targetIp = arp->target_ip_addr();
const Tins::IPv4Address transTargetIp = TranslateArpIp(targetIp);
if(transTargetIp == this->zeroIp){
return false;
}
const Tins::IPv4Address senderIp = arp->sender_ip_addr();
const Tins::IPv4Address transSenderIp = TranslateArpIp(senderIp);
if(transSenderIp == this->zeroIp){
return false;
}
arp->target_ip_addr(transTargetIp);
arp->sender_ip_addr(transSenderIp);
return true;
}
bool NatMap::handleArpAndTranslateSenderIp(Tins::ARP* arp) {
for (NatRange & range : this->ranges) {
const Tins::NetworkInterface::Info & interfaceInfo = range.interface.info();
if (!interfaceInfo.is_up) {
continue;
}
Tins::IPv4Range ipRange = range.calcIpRange(true);
if (!ipRange.contains(arp->target_ip_addr())) {
continue;
}
Tins::IPv4Address senderIp = arp->sender_ip_addr();
Tins::IPv4Address transSenderIp = range.mapIPv4Addres(senderIp, true);
arp->sender_ip_addr(transSenderIp);
IpAdressMap::const_iterator transSenderIpReqIter = this->reqIpMap.find(transSenderIp);
if (transSenderIpReqIter == reqIpMap.end()) {
this->reqIpMap.insert(IPv4AddressEntry(transSenderIp, senderIp));
}
return true;
const Tins::IPv4Address NatMap::TranslateArpIp(const Tins::IPv4Address & arpIp) {
Tins::IPv4Address transArpIp;
IpAdressMap::const_iterator transArpIpIter = this->transMap.find(arpIp);
if (transArpIpIter == transMap.end()) {
IpAdressMap::const_iterator transReqArpIpIter = this->reqIpMap.find(arpIp);
if (transReqArpIpIter == reqIpMap.end()) {
return this->zeroIp;
}
transArpIp = transReqArpIpIter->second;
this->InsertOrUdpateTranslateIpAddress(arpIp, transArpIp);
this->InsertOrUdpateTranslateIpAddress(transArpIp, arpIp);
this->reqIpMap.erase(transReqArpIpIter);
return transArpIp;
}
return false;
return transArpIpIter->second;
}
void NatMap::SendTranslatedArpRequest(const Tins::ARP * arp) {
Tins::IPv4Address targetIp = arp->target_ip_addr();
bool NatMap::handleArpAndTranslateSenderIp(Tins::ARP* arp) {
for (NatRange & range : this->ranges) {
const Tins::NetworkInterface::Info & interfaceInfo = range.interface.info();
if (!interfaceInfo.is_up) {
continue;
}
Tins::IPv4Range ipRange = range.calcIpRange(true);
const Tins::IPv4Range ipRange = range.calcIpRange(true);
if (!ipRange.contains(arp->target_ip_addr())) {
continue;
}
const Tins::IPv4Address senderIp = arp->sender_ip_addr();
const Tins::IPv4Address transSenderIp = range.mapIPv4Addres(senderIp, true);
arp->sender_ip_addr(transSenderIp);
IpAdressMap::const_iterator transSenderIpReqIter = this->reqIpMap.find(transSenderIp);
if (transSenderIpReqIter == reqIpMap.end()) {
this->reqIpMap.insert(IPv4AddressEntry(transSenderIp, senderIp));
}
return true;
}
return false;
}
void NatMap::SendTranslatedArpRequest(const Tins::ARP * arp) {
const Tins::IPv4Address targetIp = arp->target_ip_addr();
for (NatRange & range : this->ranges) {
const Tins::NetworkInterface::Info & interfaceInfo = range.interface.info();
if (!interfaceInfo.is_up) {
continue;
}
const Tins::IPv4Range ipRange = range.calcIpRange(true);
if (ipRange.contains(targetIp)) {
continue;
}
Tins::IPv4Address senderIp = arp->sender_ip_addr();
Tins::IPv4Address transSenderIp = range.mapIPv4Addres(senderIp, true);
Tins::IPv4Address transTargetIp = range.mapIPv4Addres(targetIp, true);
const Tins::IPv4Address senderIp = arp->sender_ip_addr();
const Tins::IPv4Address transSenderIp = range.mapIPv4Addres(senderIp, false);
const Tins::IPv4Address transTargetIp = range.mapIPv4Addres(targetIp, false);
IpAdressMap::const_iterator transSenderIpReqIter = this->reqIpMap.find(transSenderIp);
if (transSenderIpReqIter == reqIpMap.end()) {
this->reqIpMap.insert(IPv4AddressEntry(transSenderIp, senderIp));
@@ -266,8 +317,8 @@ namespace otonat {
this->reqIpMap.insert(IPv4AddressEntry(transTargetIp, targetIp));
}
Tins::EthernetII transArp = Tins::ARP::make_arp_request(transTargetIp, transSenderIp, arp->sender_hw_addr());
outgoingPduQueue.push(transArp.clone());
const Tins::EthernetII transArp = Tins::ARP::make_arp_request(transTargetIp, transSenderIp, arp->sender_hw_addr());
this->outgoingPduQueue.push(transArp.clone());
}
}
}

18
src/map/natmap.h
View File

@@ -13,7 +13,6 @@ namespace otonat {
typedef std::vector<NatRange> NatRangeList;
typedef std::queue<const Tins::PDU *> PduQueue;
typedef std::pair<Tins::IPv4Address, Tins::IPv4Address> IPv4AddressEntry;
typedef std::map<Tins::IPv4Address, Tins::HWAddress < 6 >> IpAdressMacMap;
typedef std::map<Tins::IPv4Address, Tins::IPv4Address> IpAdressMap;
NatMap() {
@@ -24,7 +23,6 @@ namespace otonat {
NatMap(const NatMap& other);
NatMap& operator=(const NatMap& other);
NatRangeList ranges;
IpAdressMacMap arpMap;
IpAdressMap transMap;
IpAdressMap reqIpMap;
PduQueue incommingPduQueue;
@@ -38,15 +36,17 @@ namespace otonat {
bool handleArp(Tins::ARP * arp);
bool handleArpReq(Tins::ARP * arp);
bool handleArpReply(Tins::ARP * arp);
bool handleArpAndTranslateSenderIp(Tins::ARP* arp);
bool handleArpAndTranslateSenderIp(Tins::ARP * arp);
void InsertOrUdpateTranslateIpAddress(const Tins::IPv4Address & originIp, const Tins::IPv4Address & transIp);
Tins::IPv4Address InsertOrUdpateTranslateIpAddress(const Tins::IPv4Address & originIp, const NatRange & range);
Tins::IPv4Address InsertOrUdpateTranslateIpAddress(const Tins::IPv4Address & originIp, const Tins::IPv4Address & transIp, NatRangeList & rangeList);
void TranslateIpPacket(Tins::IP * ip, const Tins::IPv4Address & transIp);
Tins::IPv4Address zeroIp;
bool isForMeOrFromMeIp(const Tins::IP * ip);
bool isForMeOrFromMeArp(const Tins::ARP * arp);
Tins::IPv4Address InsertOrUdpateTranslateIpAddress(const Tins::IPv4Address & originIp, const Tins::IPv4Address & otherTransSameRangeIp, NatRangeList & rangeList);
void TranslateIpPacket(Tins::IP * ip, const Tins::IPv4Address & transDstIp);
const Tins::IPv4Address TranslateArpIp(const Tins::IPv4Address & arpIp);
const Tins::IPv4Address zeroIp;
bool isForMeOrFromMeIp(const Tins::IP * ip) const;
bool isForMeOrFromMeArp(const Tins::ARP * arp) const;
static bool isForMeOrFromMeIp(const Tins::IP * ip, const NatRangeList & rangeList);
bool isIpInMyRanges(const Tins::IPv4Address & ipAddr);
bool isIpInMyRanges(const Tins::IPv4Address & ipAddr) const;
static bool isIpInMyRanges(const Tins::IPv4Address & ipAddr, const NatRangeList & rangeList);
void SendTranslatedArpRequest(const Tins::ARP * arp);
};