NewLife
/
SmartOS
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

去除广播过滤，客户端进行广播的客户端本地端口不固定 无法过滤是否是广播 

加强日志输出
This commit is contained in:
WangQiang 2016-07-18 02:09:19 +00:00
parent 54c04f2a0d
commit e78137c5fd
3 changed files with 18 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
TokenNet/TokenClient.cpp
View File

@ -182,6 +182,7 @@ void TokenClient::OnReceive(TokenMessage& msg, TokenController& ctrl)
void TokenClient::OnReceiveLocal(TokenMessage& msg, TokenController& ctrl) void TokenClient::OnReceiveLocal(TokenMessage& msg, TokenController& ctrl)
{ {
TS("TokenClient::OnReceiveLocal"); TS("TokenClient::OnReceiveLocal");
debug_printf("LocalRev ");
// 找到会话，如果不存在则创建 // 找到会话，如果不存在则创建
auto remote = (IPEndPoint*)msg.State; auto remote = (IPEndPoint*)msg.State;
@ -190,46 +191,29 @@ void TokenClient::OnReceiveLocal(TokenMessage& msg, TokenController& ctrl)
debug_printf("无法取得消息来源地址，设计错误！\r\n"); debug_printf("无法取得消息来源地址，设计错误！\r\n");
return; return;
} }
// 如果会话Sessions数量为零 创建首个Session专门对付广播 remote->Show(false);
if (Sessions.Count() == 0)auto fistss = new TokenSession(*this, ctrl);
// 根据远程地址，从会话列表中找到会话。如果会话不存在，则新建会话 // 根据远程地址，从会话列表中找到会话。如果会话不存在，则新建会话
TokenSession* ss = nullptr; TokenSession* ss = nullptr;
// 过滤广播端口的数据到独立的一个 Sessions[0] 避免为同一个客户端创建两个Session （一个广播 一个通讯）
bool isBroadcast = false; for (int i = 0; i < Sessions.Count(); i++)
if (remote->Port != 3377)isBroadcast = true;
if(!isBroadcast)
{ {
for (int i = 0; i < Sessions.Count(); i++) ss = (TokenSession*)Sessions[i];
if (ss && ss->Remote == *remote)
{ {
ss = (TokenSession*)Sessions[i]; debug_printf(" Session[%d]迎客 Code:0x%02X\r\n", i, msg.Code);
if (ss && ss->Remote == *remote) break;
{
debug_printf("Session[%d]迎客\r\n",i);
break;
}
ss = nullptr;
}
if (!ss)
{
debug_printf("new TokenSession\r\n");
ss = new TokenSession(*this, ctrl);
ss->Remote = *remote;
} }
ss = nullptr;
} }
else if (!ss)
{ {
ss = (TokenSession*)Sessions[0]; debug_printf("new TokenSession\r\n");
ss = new TokenSession(*this, ctrl);
ss->Remote = *remote; ss->Remote = *remote;
} }
ss->OnReceive(msg); ss->OnReceive(msg);
// 用完之后要打扫现场
if (isBroadcast)
{
ss->Key.Clear();
ss->Status = 0;
ss->LastActive = 0;
}
} }
//内网分发 //内网分发
void TokenClient::LocalSend(int start, const Buffer& bs) void TokenClient::LocalSend(int start, const Buffer& bs)

4
TokenNet/TokenController.cpp
View File

@ -241,7 +241,9 @@ bool TokenController::OnReceive(Message& msg)
Buffer bs(msg.Data, msg.Length + 2); Buffer bs(msg.Data, msg.Length + 2);
if (!Decrypt(bs, Key)) if (!Decrypt(bs, Key))
{ {
debug_printf("TokenController::OnReceive 解密失败\r\n"); debug_printf("TokenController::OnReceive 解密失败 Key:\r\n");
debug_printf("Code 0x%02X Key: ",msg.Code);
Key.Show(true);
return false; return false;
} }
} }

2
TokenNet/TokenSession.cpp
View File

@ -92,6 +92,8 @@ bool TokenSession::OnHello(TokenMessage& msg)
auto now = Sys.Ms(); auto now = Sys.Ms();
auto crc = Crc::Hash(Buffer(&now, 8)); auto crc = Crc::Hash(Buffer(&now, 8));
key = Buffer(&crc, 4); key = Buffer(&crc, 4);
debug_printf("creat key: ");
key.Show(true);
} }
ext2.Key = key; ext2.Key = key;