Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
F
fmp_vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhenfei.zhang
fmp_vip
Commits
dd7fdb79
Commit
dd7fdb79
authored
Jul 20, 2017
by
NitefullWind
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 可配置是否启用FMSOCKETHEADER。
parent
18f682b1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
1 deletions
+19
-1
fmp_vip_server.cpp
+11
-1
fmp_vip_server.h
+2
-0
fmp_vip_settings.cpp
+5
-0
fmp_vip_settings.h
+1
-0
No files found.
fmp_vip_server.cpp
View file @
dd7fdb79
...
@@ -17,6 +17,7 @@ FMPVipServer::FMPVipServer() :
...
@@ -17,6 +17,7 @@ FMPVipServer::FMPVipServer() :
{
{
Listen
(
23770
);
Listen
(
23770
);
connect
(
this
,
&
QTcpServer
::
newConnection
,
this
,
&
FMPVipServer
::
onNewConnection
);
connect
(
this
,
&
QTcpServer
::
newConnection
,
this
,
&
FMPVipServer
::
onNewConnection
);
isNeedSocketHeader
=
FMPVipSettings
::
instance
()
->
getIsNeedSocketHeader
();
}
}
void
FMPVipServer
::
Listen
(
quint16
port
)
void
FMPVipServer
::
Listen
(
quint16
port
)
...
@@ -56,10 +57,19 @@ void FMPVipServer::onReadyRead()
...
@@ -56,10 +57,19 @@ void FMPVipServer::onReadyRead()
{
{
QByteArray
recvData
=
socket
->
readAll
();
QByteArray
recvData
=
socket
->
readAll
();
if
(
isNeedSocketHeader
)
{
FMSOCKEHEADER
header
=
{
0
};
memcpy
(
&
header
,
recvData
.
data
(),
sizeof
(
FMSOCKEHEADER
));
if
(
header
.
flag
!=
FMSOCKFLAG
)
{
FMP_WARN
()
<<
"Incompatible protocol."
;
return
;
}
recvData
=
recvData
.
mid
(
sizeof
(
FMSOCKEHEADER
));
}
QByteArray
rspData
;
QByteArray
rspData
;
dispatcher
->
doTask
(
recvData
,
rspData
);
dispatcher
->
doTask
(
recvData
,
rspData
);
rspData
;
Write
(
rspData
);
Write
(
rspData
);
socket
->
waitForBytesWritten
();
socket
->
waitForBytesWritten
();
...
...
fmp_vip_server.h
View file @
dd7fdb79
...
@@ -34,6 +34,8 @@ private:
...
@@ -34,6 +34,8 @@ private:
QTcpSocket
*
socket
;
QTcpSocket
*
socket
;
FMVipDispatcher
*
dispatcher
;
FMVipDispatcher
*
dispatcher
;
bool
isNeedSocketHeader
;
};
};
#endif // FMP_VIP_SERVER_H
#endif // FMP_VIP_SERVER_H
fmp_vip_settings.cpp
View file @
dd7fdb79
...
@@ -22,6 +22,11 @@ QString FMPVipSettings::getServerUrl()
...
@@ -22,6 +22,11 @@ QString FMPVipSettings::getServerUrl()
return
_GetValue
(
FMP_INIKEY_VIPSERVER
).
toString
();
return
_GetValue
(
FMP_INIKEY_VIPSERVER
).
toString
();
}
}
bool
FMPVipSettings
::
getIsNeedSocketHeader
()
{
return
_GetValue
(
FMP_INIKEY_NEEDSOCKETHEADER
,
false
).
toBool
();
}
QVariant
FMPVipSettings
::
_GetValue
(
const
QString
&
key
,
QVariant
defaultValue
)
QVariant
FMPVipSettings
::
_GetValue
(
const
QString
&
key
,
QVariant
defaultValue
)
{
{
if
(
_settings
)
{
if
(
_settings
)
{
...
...
fmp_vip_settings.h
View file @
dd7fdb79
...
@@ -15,6 +15,7 @@ public:
...
@@ -15,6 +15,7 @@ public:
void
init
(
FMPSettingsInterface
*
settings
);
void
init
(
FMPSettingsInterface
*
settings
);
QString
getServerUrl
();
QString
getServerUrl
();
bool
getIsNeedSocketHeader
();
private
:
private
:
explicit
FMPVipSettings
(
QObject
*
parent
=
0
);
explicit
FMPVipSettings
(
QObject
*
parent
=
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment