Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cellframe-ui-sdk
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
cellframe
cellframe-ui-sdk
Commits
1601e6fc
Commit
1601e6fc
authored
4 years ago
by
Constantin Papizh
Browse files
Options
Downloads
Patches
Plain Diff
Massive update
parent
2dd0083e
No related branches found
No related tags found
1 merge request
!9
Bugs 4276 4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.cpp
+14
-12
14 additions, 12 deletions
stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.cpp
stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.h
+1
-5
1 addition, 5 deletions
stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.h
with
15 additions
and
17 deletions
stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.cpp
+
14
−
12
View file @
1601e6fc
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
stream/ch/chain/net/srv/vpn/DapStreamChChainNetSrvVpn.h
+
1
−
5
View file @
1601e6fc
...
...
@@ -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
();
};
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment