Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
蚂蚁寻路
zoompipeline
提交
5df4abe6
zoompipeline
项目概览
蚂蚁寻路
/
zoompipeline
与 Fork 源项目一致
Fork自
colorEagleStdio / zoompipeline
通知
4
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
zoompipeline
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5df4abe6
编写于
4月 27, 2014
作者:
丁劲犇
😸
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix some problems
上级
7ce1c1b0
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
32 addition
and
9 deletion
+32
-9
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.cpp
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.cpp
+11
-9
ZoomPipeline_FuncSvr/network/zp_nettransthread.cpp
ZoomPipeline_FuncSvr/network/zp_nettransthread.cpp
+21
-0
未找到文件。
ZoomPipeline_FuncSvr/cluster/zp_clusterterm.cpp
浏览文件 @
5df4abe6
...
...
@@ -177,8 +177,6 @@ namespace ZP_Cluster{
//qDebug()<<QString("%1(ref %2) deleting.\n").arg((unsigned int)pdelobj).arg(pdelobj->ref());
pdelobj
->
deleteLater
();
}
//re-Broadcast Servers
BroadcastServers
();
}
//some data arrival
...
...
@@ -229,20 +227,17 @@ namespace ZP_Cluster{
}
void
zp_ClusterTerm
::
BroadcastServers
()
{
if
(
name
().
length
()
<
1
)
return
;
m_hash_mutex
.
lock
();
QList
<
QString
>
keys
=
m_hash_Name2node
.
keys
();
int
nsz
=
keys
.
size
();
if
(
nsz
==
0
)
{
m_hash_mutex
.
unlock
();
return
;
}
//Msgs
int
nMsgLen
=
sizeof
(
CROSS_SVR_MSG
::
tag_header
)
+
sizeof
(
CROSS_SVR_MSG
::
uni_payload
::
tag_CSM_Broadcast
)
*
nsz
;
int
nMsgLen
=
sizeof
(
CROSS_SVR_MSG
::
tag_header
)
+
sizeof
(
CROSS_SVR_MSG
::
uni_payload
::
tag_CSM_Broadcast
)
*
(
nsz
+
1
)
;
QByteArray
array
(
nMsgLen
,
0
);
CROSS_SVR_MSG
*
pMsg
=
(
CROSS_SVR_MSG
*
)
array
.
data
();
pMsg
->
hearder
.
Mark
=
0x1234
;
pMsg
->
hearder
.
data_length
=
sizeof
(
CROSS_SVR_MSG
::
uni_payload
::
tag_CSM_Broadcast
)
*
nsz
;
pMsg
->
hearder
.
data_length
=
sizeof
(
CROSS_SVR_MSG
::
uni_payload
::
tag_CSM_Broadcast
)
*
(
nsz
+
1
)
;
pMsg
->
hearder
.
messagetype
=
0x02
;
int
ct
=
0
;
foreach
(
QString
key
,
keys
)
...
...
@@ -258,6 +253,13 @@ namespace ZP_Cluster{
++
ct
;
}
m_hash_mutex
.
unlock
();
strncpy
((
char
*
)
pMsg
->
payload
.
broadcastMsg
[
ct
].
name
,
this
->
name
().
toStdString
().
c_str
(),
sizeof
(
pMsg
->
payload
.
broadcastMsg
[
ct
].
name
)
-
1
);
strncpy
((
char
*
)
pMsg
->
payload
.
broadcastMsg
[
ct
].
Address
,
this
->
publishAddr
().
toString
().
toStdString
().
c_str
(),
sizeof
(
pMsg
->
payload
.
broadcastMsg
[
ct
].
Address
)
-
1
);
pMsg
->
payload
.
broadcastMsg
[
ct
].
port
=
this
->
publishPort
();
m_pClusterNet
->
BroadcastData
(
0
,
array
);
}
...
...
ZoomPipeline_FuncSvr/network/zp_nettransthread.cpp
浏览文件 @
5df4abe6
...
...
@@ -262,7 +262,28 @@ namespace ZPNetwork{
{
emit
evt_SocketError
(
pSock
,
socketError
);
emit
evt_Message
(
pSock
,
"Debug:"
+
pSock
->
errorString
());
if
(
m_bSSLConnection
)
{
QSslSocket
*
psslsock
=
qobject_cast
<
QSslSocket
*>
(
pSock
);
if
(
psslsock
)
disconnect
(
psslsock
,
&
QSslSocket
::
encrypted
,
this
,
&
zp_netTransThread
::
on_encrypted
);
}
disconnect
(
pSock
,
&
QTcpSocket
::
readyRead
,
this
,
&
zp_netTransThread
::
new_data_recieved
);
disconnect
(
pSock
,
&
QTcpSocket
::
disconnected
,
this
,
&
zp_netTransThread
::
client_closed
);
disconnect
(
pSock
,
SIGNAL
(
error
(
QAbstractSocket
::
SocketError
)),
this
,
SLOT
(
displayError
(
QAbstractSocket
::
SocketError
)));
disconnect
(
pSock
,
&
QTcpSocket
::
bytesWritten
,
this
,
&
zp_netTransThread
::
some_data_sended
);
disconnect
(
pSock
,
&
QTcpSocket
::
connected
,
this
,
&
zp_netTransThread
::
on_connected
);
m_buffer_sending
.
remove
(
pSock
);
m_buffer_sending_offset
.
remove
(
pSock
);
m_mutex_protect
.
lock
();
m_clientList
.
remove
(
pSock
);
m_mutex_protect
.
unlock
();
pSock
->
abort
();
pSock
->
deleteLater
();
emit
evt_ClientDisconnected
(
pSock
);
emit
evt_Message
(
pSock
,
"Info>"
+
QString
(
tr
(
"Client Closed."
)));
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录