Просмотр исходного кода

Revert "Pissibly fix serialization errors"

This reverts commit ffe5763923660a0ea6b3f667b3da2e2921dc127e.

Serialization error is called by Tins if transforming a PDU to a vector
fails.
Jonas Pflanzer 5 лет назад
Родитель
Сommit
58b482a69e

+ 0 - 11
daemon/include/CovertChannel/CovertChannel.h

@@ -1,7 +1,6 @@
 #ifndef COVERTCHANNEL_H
 #define COVERTCHANNEL_H
 
-#include <mutex>
 #include <thread>
 #include <tins/tins.h>
 
@@ -157,16 +156,6 @@ protected:
 	 */
 	Tins::PacketSender outerSender;
 
-	/**
-	 * lock sender to prevent serialization errors
-	 */
-	std::mutex innerSenderMutex;
-
-	/**
-	 * lock sender to prevent serialization errors
-	 */
-	std::mutex outerSenderMutex;
-
 private:
 	/**
 	 * Thread for the inner forward sniffer

+ 0 - 8
daemon/include/CovertChannel/TCPUrgencyChannel.hpp

@@ -72,15 +72,11 @@ protected:
 			uint16_t data = tcp.urg_ptr();
 			protocol.receive((uint8_t *)(&data));
 			tcp.urg_ptr(0);
-			innerSenderMutex.lock();
 			innerSender.send(pdu);
-			innerSenderMutex.unlock();
 		} else {
 			// uint16_t urg = tcp.urg_ptr();
 			// tcp.urg_ptr(0);
-			innerSenderMutex.lock();
 			innerSender.send(pdu);
-			innerSenderMutex.unlock();
 		}
 		return true;
 	}
@@ -97,16 +93,12 @@ protected:
 	virtual bool handleChannelFromInner(Tins::PDU &pdu) {
 		Tins::TCP &tcp = pdu.rfind_pdu<Tins::TCP>();
 		if constexpr (PASSIVE) {
-			outerSenderMutex.lock();
 			outerSender.send(pdu);
-			outerSenderMutex.unlock();
 		} else {
 			uint16_t data = 0;
 			protocol.send((uint8_t *)(&data));
 			tcp.urg_ptr(data);
-			outerSenderMutex.lock();
 			outerSender.send(pdu);
-			outerSenderMutex.unlock();
 		}
 		return true;
 	}

+ 0 - 4
daemon/src/CovertChannel/CovertChannel.cpp

@@ -63,17 +63,13 @@ void CovertChannel::startInnerChannelSniffing() { innerChannelSniffer->sniff_loo
 void CovertChannel::startOuterChannelSniffing() { outerChannelSniffer->sniff_loop(make_sniffer_handler(this, &CovertChannel::handleChannelFromOuter)); }
 
 bool CovertChannel::handleForwardFromOuter(Tins::PDU &pdu) {
-	innerSenderMutex.lock();
 	innerSender.send(pdu);
-	innerSenderMutex.unlock();
 
 	return true;
 }
 
 bool CovertChannel::handleForwardFromInner(Tins::PDU &pdu) {
-	outerSenderMutex.lock();
 	outerSender.send(pdu);
-	outerSenderMutex.unlock();
 
 	return true;
 }