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

add pdusniffer

Browse Source
This commit is contained in:
stubbfel
2015-09-29 23:20:00 +02:00
parent edc11a5352
commit 26833adf15
6 changed files with 178 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
nbproject/Makefile-Debug.mk
View File

@@ -36,6 +36,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
# Object Files
OBJECTFILES= \
${OBJECTDIR}/src/PduSender.o \
${OBJECTDIR}/src/PduSniffer.o \
${OBJECTDIR}/src/main.o \
${OBJECTDIR}/src/map/NatRange.o \
${OBJECTDIR}/src/map/natmap.o
@@ -76,6 +77,11 @@ ${OBJECTDIR}/src/PduSender.o: src/PduSender.cpp
${RM} "$@.d"
$(COMPILE.cc) -g -Wall -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSender.o src/PduSender.cpp
${OBJECTDIR}/src/PduSniffer.o: src/PduSniffer.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.cc) -g -Wall -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer.o src/PduSniffer.cpp
${OBJECTDIR}/src/main.o: src/main.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
@@ -126,6 +132,19 @@ ${OBJECTDIR}/src/PduSender_nomain.o: ${OBJECTDIR}/src/PduSender.o src/PduSender.
${CP} ${OBJECTDIR}/src/PduSender.o ${OBJECTDIR}/src/PduSender_nomain.o;\
fi
${OBJECTDIR}/src/PduSniffer_nomain.o: ${OBJECTDIR}/src/PduSniffer.o src/PduSniffer.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/PduSniffer.o`; \
if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \
${RM} "$@.d";\
$(COMPILE.cc) -g -Wall -std=c++11 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer_nomain.o src/PduSniffer.cpp;\
else \
${CP} ${OBJECTDIR}/src/PduSniffer.o ${OBJECTDIR}/src/PduSniffer_nomain.o;\
fi
${OBJECTDIR}/src/main_nomain.o: ${OBJECTDIR}/src/main.o src/main.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/main.o`; \

19
nbproject/Makefile-Release.mk
View File

@@ -36,6 +36,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
# Object Files
OBJECTFILES= \
${OBJECTDIR}/src/PduSender.o \
${OBJECTDIR}/src/PduSniffer.o \
${OBJECTDIR}/src/main.o \
${OBJECTDIR}/src/map/NatRange.o \
${OBJECTDIR}/src/map/natmap.o
@@ -76,6 +77,11 @@ ${OBJECTDIR}/src/PduSender.o: src/PduSender.cpp
${RM} "$@.d"
$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSender.o src/PduSender.cpp
${OBJECTDIR}/src/PduSniffer.o: src/PduSniffer.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.cc) -O2 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer.o src/PduSniffer.cpp
${OBJECTDIR}/src/main.o: src/main.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
@@ -126,6 +132,19 @@ ${OBJECTDIR}/src/PduSender_nomain.o: ${OBJECTDIR}/src/PduSender.o src/PduSender.
${CP} ${OBJECTDIR}/src/PduSender.o ${OBJECTDIR}/src/PduSender_nomain.o;\
fi
${OBJECTDIR}/src/PduSniffer_nomain.o: ${OBJECTDIR}/src/PduSniffer.o src/PduSniffer.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/PduSniffer.o`; \
if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \
${RM} "$@.d";\
$(COMPILE.cc) -O2 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer_nomain.o src/PduSniffer.cpp;\
else \
${CP} ${OBJECTDIR}/src/PduSniffer.o ${OBJECTDIR}/src/PduSniffer_nomain.o;\
fi
${OBJECTDIR}/src/main_nomain.o: ${OBJECTDIR}/src/main.o src/main.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/main.o`; \

19
nbproject/Makefile-Unitest.mk
View File

@@ -36,6 +36,7 @@ OBJECTDIR=${CND_BUILDDIR}/${CND_CONF}/${CND_PLATFORM}
# Object Files
OBJECTFILES= \
${OBJECTDIR}/src/PduSender.o \
${OBJECTDIR}/src/PduSniffer.o \
${OBJECTDIR}/src/main.o \
${OBJECTDIR}/src/map/NatRange.o \
${OBJECTDIR}/src/map/natmap.o
@@ -76,6 +77,11 @@ ${OBJECTDIR}/src/PduSender.o: src/PduSender.cpp
${RM} "$@.d"
$(COMPILE.cc) -g -Itest -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSender.o src/PduSender.cpp
${OBJECTDIR}/src/PduSniffer.o: src/PduSniffer.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
$(COMPILE.cc) -g -Itest -std=c++11 -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer.o src/PduSniffer.cpp
${OBJECTDIR}/src/main.o: src/main.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
@@ -126,6 +132,19 @@ ${OBJECTDIR}/src/PduSender_nomain.o: ${OBJECTDIR}/src/PduSender.o src/PduSender.
${CP} ${OBJECTDIR}/src/PduSender.o ${OBJECTDIR}/src/PduSender_nomain.o;\
fi
${OBJECTDIR}/src/PduSniffer_nomain.o: ${OBJECTDIR}/src/PduSniffer.o src/PduSniffer.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/PduSniffer.o`; \
if (echo "$$NMOUTPUT" | ${GREP} '|main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T main$$') || \
(echo "$$NMOUTPUT" | ${GREP} 'T _main$$'); \
then \
${RM} "$@.d";\
$(COMPILE.cc) -g -Itest -std=c++11 -Dmain=__nomain -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/PduSniffer_nomain.o src/PduSniffer.cpp;\
else \
${CP} ${OBJECTDIR}/src/PduSniffer.o ${OBJECTDIR}/src/PduSniffer_nomain.o;\
fi
${OBJECTDIR}/src/main_nomain.o: ${OBJECTDIR}/src/main.o src/main.cpp
${MKDIR} -p ${OBJECTDIR}/src
@NMOUTPUT=`${NM} ${OBJECTDIR}/src/main.o`; \

14
nbproject/configurations.xml
View File

@@ -9,6 +9,7 @@
</logicalFolder>
<itemPath>src/map/NatRange.h</itemPath>
<itemPath>src/PduSender.h</itemPath>
<itemPath>src/PduSniffer.h</itemPath>
</logicalFolder>
<logicalFolder name="ResourceFiles"
displayName="Resource Files"
@@ -22,6 +23,7 @@
</logicalFolder>
<itemPath>src/map/NatRange.cpp</itemPath>
<itemPath>src/PduSender.cpp</itemPath>
<itemPath>src/PduSniffer.cpp</itemPath>
<itemPath>src/main.cpp</itemPath>
</logicalFolder>
<logicalFolder name="TestFiles"
@@ -85,6 +87,10 @@
</item>
<item path="src/PduSender.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/PduSniffer.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/PduSniffer.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/main.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/map/NatRange.cpp" ex="false" tool="1" flavor2="0">
@@ -146,6 +152,10 @@
</item>
<item path="src/PduSender.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/PduSniffer.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/PduSniffer.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/main.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/map/NatRange.cpp" ex="false" tool="1" flavor2="0">
@@ -201,6 +211,10 @@
</item>
<item path="src/PduSender.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/PduSniffer.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/PduSniffer.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/main.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/map/NatRange.cpp" ex="false" tool="1" flavor2="0">

67
src/PduSniffer.cpp Normal file
View File

@@ -0,0 +1,67 @@
/*
* File: PduSniffer.cpp
* Author: dev
*
* Created on 29. September 2015, 21:29
*/
#include "PduSniffer.h"
namespace otonat {
PduSniffer::PduSniffer(NatMap * map) {
this->map = map;
this->isRunnig = false;
config.set_promisc_mode(true);
config.set_immediate_mode(true);
}
PduSniffer::PduSniffer(const PduSniffer& orig) : snifferList(orig.snifferList), config(orig.config) {
this->map = orig.map;
this->isRunnig = orig.isRunnig;
}
PduSniffer::~PduSniffer() {
Stop();
for (Tins::Sniffer * sniffer : snifferList) {
delete sniffer;
}
this->snifferList.clear();
}
PduSniffer& PduSniffer::operator=(const PduSniffer& rhs) {
if (this == &rhs) return *this; // handle self assignment
this->map = rhs.map;
this->isRunnig = rhs.isRunnig;
this->config = rhs.config;
this->snifferList = rhs.snifferList;
return *this;
}
bool PduSniffer::sniffPdu(const Tins::PDU& pdu) {
this->map->pushPduToIncommingPduQueue(pdu.clone());
return this->isRunnig;
}
void PduSniffer::Start() {
this->isRunnig = true;
}
void PduSniffer::Stop() {
this->isRunnig = false;
}
void PduSniffer::SniffInterface(const Tins::NetworkInterface & interface) {
Start();
Tins::Sniffer * sniffer = new Tins::Sniffer(interface.name(), config);
sniffer->sniff_loop(std::bind(&PduSniffer::sniffPdu, this, std::placeholders::_1));
this->snifferList.push_back(sniffer);
}
std::thread * PduSniffer::SniffInterfaceInNewThread(const Tins::NetworkInterface& interface){
std::thread * newThread = new std::thread(std::bind(&PduSniffer::SniffInterface, this, interface));
return newThread;
}
}

40
src/PduSniffer.h Normal file
View File

@@ -0,0 +1,40 @@
/*
* File: PduSniffer.h
* Author: dev
*
* Created on 29. September 2015, 21:29
*/
#ifndef PDUSNIFFER_H
#define PDUSNIFFER_H
#include "map/natmap.h"
#include <tins/tins.h>
#include <thread>
namespace otonat {
class PduSniffer {
public:
typedef std::vector<Tins::Sniffer *> SnifferList;
PduSniffer(NatMap * map);
PduSniffer(const PduSniffer& orig);
PduSniffer& operator=(const PduSniffer& rhs);
virtual ~PduSniffer();
void SniffInterface(const Tins::NetworkInterface & interface);
std::thread * SniffInterfaceInNewThread(const Tins::NetworkInterface & interface);
void Start();
void Stop();
private:
SnifferList snifferList;
NatMap * map;
Tins::SnifferConfiguration config;
bool isRunnig;
bool sniffPdu(const Tins::PDU &pdu);
};
}
#endif /* PDUSNIFFER_H */