diff --git a/server/gameserver/GGListener.cc b/server/gameserver/GGListener.cc index 3b001164..fc9fd977 100644 --- a/server/gameserver/GGListener.cc +++ b/server/gameserver/GGListener.cc @@ -30,13 +30,15 @@ public: if (buflen - offset < sizeof(f8::WSProxyPackHead_C) + p->packlen) { break; } - App::Instance()->AddSocketMsg(SF_GameGate, - (socket_handle << 16) + p->socket_handle, - p->ip_saddr, - p->msgid, - p->seqid, - &buf[offset + sizeof(f8::WSProxyPackHead_C)], - p->packlen); + f8::App::Instance()->AddSocketMsg + (SF_GameGate, + (socket_handle << 16) + p->socket_handle, + p->ip_saddr, + p->msgid, + p->seqid, + &buf[offset + sizeof(f8::WSProxyPackHead_C)], + p->packlen, + 0); offset += sizeof(f8::WSProxyPackHead_C) + p->packlen; } else { warning = true; diff --git a/server/gameserver/app.cc b/server/gameserver/app.cc index f4ba2064..8a193763 100644 --- a/server/gameserver/app.cc +++ b/server/gameserver/app.cc @@ -274,40 +274,6 @@ int App::Run() } #endif -void App::AddSocketMsg(SocketFrom_e sockfrom, - int sockhandle, - long ip_saddr, - unsigned short msgid, - unsigned int seqid, - const char *msgbody, - int bodylen) -{ - MsgNode *p = (MsgNode*) malloc(sizeof(MsgNode)); - memset(p, 0, sizeof(MsgNode)); - p->sockfrom = sockfrom; - p->ip_saddr = ip_saddr; - p->sockhandle = sockhandle; - p->msgid = msgid; - p->seqid = seqid; - p->buf = nullptr; - p->buflen = bodylen; - if (bodylen > 0) { - p->buf = (char*)malloc(bodylen); - memmove(p->buf, msgbody, bodylen); - } - msg_mutex_->lock(); - if (bot_node_) { - bot_node_->next = p; - bot_node_ = p; - } else { - top_node_ = p; - bot_node_ = p; - } - ++msgnode_size_; - msg_mutex_->unlock(); - f8::App::Instance()->NotifyLoopCond(); -} - void App::QuickExecute(int delta_time) { f8::MsgQueue::Instance()->Update(); diff --git a/server/gameserver/app.h b/server/gameserver/app.h index bbabdd0c..dce8d5f9 100644 --- a/server/gameserver/app.h +++ b/server/gameserver/app.h @@ -22,14 +22,6 @@ public: virtual bool HasTask() override; virtual void DispatchSocketMsg(f8::MsgHdr* hdr) override; - void AddSocketMsg(SocketFrom_e sockfrom, - int sockhandle, - long ip_saddr, - unsigned short msgid, - unsigned int seqid, - const char *msgbody, - int bodylen); - long long AllocTempHeroUniId(); long long AllocTempWeaponUniId(); bool IsServicing() const { return servicing_; }