From 1601e6fcb8e3fda55da5d91aa8f26b4146e7a427 Mon Sep 17 00:00:00 2001
From: Constantin Papizh <p.const@bk.ru>
Date: Tue, 8 Sep 2020 18:17:32 +0300
Subject: [PATCH] Massive update
---
.../net/srv/vpn/DapStreamChChainNetSrvVpn.cpp | 26 ++++++++++---------
.../net/srv/vpn/DapStreamChChainNetSrvVpn.h | 6 +----
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.cpp b/stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.cpp
index 91691e40..bbb4568c 100644
--- a/stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.cpp
+++ b/stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.cpp
@@ -214,15 +214,15 @@ ChChainNetSrvVpn::ChChainNetSrvVpn(DapStreamer * a_streamer, DapSession * mainDa
{
tun = new DapTunNative();
m_fdListener = nullptr;
- connect(tun, &DapTunNative::created, this, &ChChainNetSrvVpn::tunCreated);
- connect(tun, &DapTunNative::destroyed, this, &ChChainNetSrvVpn::tunDestroyed);
- connect(tun, &DapTunNative::error , this, &ChChainNetSrvVpn::tunError);
- connect(tun, &DapTunNative::packetOut, this, &ChChainNetSrvVpn::packetOut);
- connect(tun, &DapTunNative::sendCmd, this, &ChChainNetSrvVpn::sendCmdAll);
- connect(tun, &DapTunNative::bytesRead, this, &ChChainNetSrvVpn::bytesRead);
- connect(tun, &DapTunNative::bytesWrite, this, &ChChainNetSrvVpn::bytesWrite);
- connect(tun, &DapTunNative::nativeCreateRequest, this, &ChChainNetSrvVpn::sigTunNativeCreate);
- connect(tun, &DapTunNative::nativeDestroyRequest, this, &ChChainNetSrvVpn::sigNativeDestroy);
+ connect(tun, &DapTunNative::created, this, &ChChainNetSrvVpn::tunCreated);
+ connect(tun, &DapTunNative::destroyed, this, &ChChainNetSrvVpn::tunDestroyed);
+ connect(tun, &DapTunNative::error, this, &ChChainNetSrvVpn::tunError);
+ connect(tun, &DapTunNative::packetOut, this, &ChChainNetSrvVpn::packetOut);
+ connect(tun, &DapTunNative::sendCmd, this, &ChChainNetSrvVpn::sendCmdAll);
+ connect(tun, &DapTunNative::bytesRead, this, &ChChainNetSrvVpn::bytesRead);
+ connect(tun, &DapTunNative::bytesWrite, this, &ChChainNetSrvVpn::bytesWrite);
+ connect(tun, &DapTunNative::nativeCreateRequest, this, &ChChainNetSrvVpn::sigTunNativeCreate);
+ connect(tun, &DapTunNative::nativeDestroyRequest, this, &ChChainNetSrvVpn::sigNativeDestroy);
}
/**
@@ -257,13 +257,11 @@ void ChChainNetSrvVpn::packetOut(Dap::Stream::Packet *pkt)
*/
void ChChainNetSrvVpn::requestIP(quint32 a_usageId)
{
- emit netConfigRequested();
Dap::Stream::Packet * pktOut = reinterpret_cast<Dap::Stream::Packet*>(::calloc(1 ,sizeof(pktOut->header)));
pktOut->header.op_code=STREAM_SF_PACKET_OP_CODE_RAW_L3_ADDR_REQUEST;
pktOut->header.usage_id = a_usageId;
qInfo() << "Request for IP with usage_id: " << pktOut->header.usage_id;
packetOut(pktOut);
- emit ipRequested();
}
/**
@@ -273,7 +271,6 @@ void ChChainNetSrvVpn::netConfigClear()
{
m_addr.clear();
m_gw.clear();
- emit netConfigCleared();
}
/**
@@ -318,6 +315,11 @@ void ChChainNetSrvVpn::tunCreate()
//
+void ChChainNetSrvVpn::tunStandby()
+{
+ tun->standby();
+}
+
void ChChainNetSrvVpn::tunDestroy()
{
tun->destroy();
diff --git a/stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.h b/stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.h
index f31ee99b..f589031c 100644
--- a/stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.h
+++ b/stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.h
@@ -106,7 +106,6 @@ namespace Dap {
void sigTunNativeCreate();
void sigNativeDestroy();
-
public:
ChChainNetSrvVpn(DapStreamer * a_streamer, DapSession * mainDapSession);
@@ -123,16 +122,12 @@ namespace Dap {
signals:
void netConfigReceived(QString,QString);
- void netConfigRequested();
void netConfigReceivedSame();
- void netConfigCleared();
void tunCreated();
void tunDestroyed();
void tunError(const QString&);
void tunWriteData();
- void ipRequested();
-
void sendCmdAll(const QString&);
public slots:
void onPktIn(DapChannelPacket *pkt) override;
@@ -143,6 +138,7 @@ namespace Dap {
void tunCreate(); // create with all predefined before values
void tunDestroy();
+ void tunStandby();
};
}
--
GitLab