From 498863e3628b7dacad8786f4b937d3d9990214a1 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 3 May 2020 16:36:56 +0800 Subject: [PATCH] 1 --- server/imserver/IMConn.cc | 2 +- server/imserver/MSConn.cc | 2 +- server/imserver/app.cc | 6 ++++-- server/imserver/constant.h | 6 ++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server/imserver/IMConn.cc b/server/imserver/IMConn.cc index e623902..3467951 100644 --- a/server/imserver/IMConn.cc +++ b/server/imserver/IMConn.cc @@ -207,7 +207,7 @@ void IMConn::on_socketread(a8::AsyncTcpClient* sender, char* buf, unsigned int l if (recv_bufflen_ - offset < sizeof(f8::WSProxyPackHead_S) + real_len) { break; } - App::Instance()->AddSocketMsg(SF_TargetServer, + App::Instance()->AddSocketMsg(SF_IMConn, p->socket_handle, instance_id, p->msgid, diff --git a/server/imserver/MSConn.cc b/server/imserver/MSConn.cc index 8fe1e51..4a1fbca 100644 --- a/server/imserver/MSConn.cc +++ b/server/imserver/MSConn.cc @@ -207,7 +207,7 @@ void MSConn::on_socketread(a8::AsyncTcpClient* sender, char* buf, unsigned int l if (recv_bufflen_ - offset < sizeof(f8::WSProxyPackHead_S) + real_len) { break; } - App::Instance()->AddSocketMsg(SF_TargetServer, + App::Instance()->AddSocketMsg(SF_MSConn, p->socket_handle, instance_id, p->msgid, diff --git a/server/imserver/app.cc b/server/imserver/app.cc index d83df08..d6892e6 100644 --- a/server/imserver/app.cc +++ b/server/imserver/app.cc @@ -356,16 +356,18 @@ void App::DispatchMsg() } break; - case SF_TargetServer: + case SF_IMConn: { - ProcessTargetServerMsg(hdr); + } break; + #if 0 case SF_MasterServer: { ProcessMasterServerMsg(hdr); } break; + #endif } if (pdelnode->buf) { free(pdelnode->buf); diff --git a/server/imserver/constant.h b/server/imserver/constant.h index a03de9a..7258543 100644 --- a/server/imserver/constant.h +++ b/server/imserver/constant.h @@ -4,8 +4,8 @@ enum SocketFrom_e { SF_WSProxy, SF_IMServer, - SF_TargetServer, - SF_MasterServer, + SF_IMConn, + SF_MSConn, }; enum InnerMesssage_e @@ -14,8 +14,6 @@ enum InnerMesssage_e IM_PlayerOffline, IM_ExecGM, IM_MasterSvrDisconnect, - IM_TargetConnConnect, - IM_TargetConnDisconnect, IM_IMServerSocketDisconnect, IM_IMConnConnect, IM_IMConnDisconnect,