From 40a8f37ed6adee5b822dfe46ebbeb73785a467a2 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 17 Sep 2019 17:32:40 +0800 Subject: [PATCH] 1 --- server/gameserver/GCListener.cc | 5 +---- server/gameserver/GCListener.h | 6 +++--- server/gameserver/playermgr.cc | 2 +- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/server/gameserver/GCListener.cc b/server/gameserver/GCListener.cc index 2806f9a..d413d25 100644 --- a/server/gameserver/GCListener.cc +++ b/server/gameserver/GCListener.cc @@ -232,12 +232,9 @@ void GCListener::SetKey(int sockhandle, const std::string& key) tcp_listener_->UnLockClients(); } -void GCListener::InternalSendMsg(int socket_handle, int msgid, google::protobuf::Message& msg, int guess_size) +void GCListener::InternalSendMsg(int socket_handle, int msgid, google::protobuf::Message& msg) { unsigned short packlen = 2 + CustomPbSerializeSize(&msg); - if (guess_size > 0 && packlen - 2 < guess_size) { - packlen = guess_size + 2; - } char* buff = (char*)malloc(sizeof(ServerPktHeader) + packlen); memset(buff, 0, sizeof(ServerPktHeader) + packlen); ServerPktHeader* head = (ServerPktHeader*)buff; diff --git a/server/gameserver/GCListener.h b/server/gameserver/GCListener.h index 1a68f06..9024705 100644 --- a/server/gameserver/GCListener.h +++ b/server/gameserver/GCListener.h @@ -33,11 +33,11 @@ class GCListener : public a8::Singleton void UnInit(); template - void SendMsg(int socket_handle, T& msg, int guess_size = 0) + void SendMsg(int socket_handle, T& msg) { static int msgid = f8::Net_GetMessageId(msg); - InternalSendMsg(socket_handle, msgid, msg, guess_size); + InternalSendMsg(socket_handle, msgid, msg); } void SendText(int sockhandle, const std::string& text); @@ -47,7 +47,7 @@ class GCListener : public a8::Singleton void SetKey(int sockhandle, const std::string& key); private: - void InternalSendMsg(int socket_handle, int msgid, google::protobuf::Message& msg, int guess_size); + void InternalSendMsg(int socket_handle, int msgid, google::protobuf::Message& msg); private: a8::TcpListener *tcp_listener_ = nullptr; diff --git a/server/gameserver/playermgr.cc b/server/gameserver/playermgr.cc index a43bf0d..26083ae 100644 --- a/server/gameserver/playermgr.cc +++ b/server/gameserver/playermgr.cc @@ -83,7 +83,7 @@ void PlayerMgr::_CMCharEnum(f8::MsgHdr& hdr, const cs::CMCharEnum& msg) DBEngine::Instance()->Next(); } } - GCListener::Instance()->SendMsg(hdr.socket_handle, respmsg, 100); + GCListener::Instance()->SendMsg(hdr.socket_handle, respmsg); } int PlayerMgr::OnlineNum()