Skip to content
Snippets Groups Projects
Commit 1601e6fc authored by Constantin Papizh's avatar Constantin Papizh
Browse files

Massive update

parent 2dd0083e
No related branches found
No related tags found
1 merge request!9Bugs 4276 4
......@@ -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();
......
......@@ -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();
};
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment