server_common/dbproxy
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: server_common:master
Branches Tags
server_common:master
server_common:game1008
server_common:game1008_banshu
..
compare: server_common:game1008_banshu
Branches Tags
server_common:game1008
server_common:master
server_common:game1008_banshu

No commits in common. "master" and "game1008_banshu" have entirely different histories.
master ... game1008_b

4 changed files with 12 additions and 15 deletions
Show Stats Expand all files Collapse all files

21
server/dbproxy/GSListener.cc
View File

@ -12,8 +12,6 @@
#include "ss_proto.pb.h"
#include "handlermgr.h"
const int PACK_MAX = 1024 * 1024 * 10;
class GSClientSession: public a8::MixedSession
{
public:
@ -26,10 +24,10 @@ public:
is_activite = true;
#endif
bool warning = false;
while (buflen - offset >= sizeof(f8::BigPackHead)) {
f8::BigPackHead* p = (f8::BigPackHead*)&buf[offset];
while (buflen - offset >= sizeof(f8::PackHead)) {
f8::PackHead* p = (f8::PackHead*)&buf[offset];
if (p->magic_code == f8::MAGIC_CODE) {
if (buflen - offset < sizeof(f8::BigPackHead) + p->packlen) {
if (buflen - offset < sizeof(f8::PackHead) + p->packlen) {
break;
}
App::Instance()->AddSocketMsg(SF_GameServer,
@ -37,9 +35,9 @@ public:
saddr,
p->msgid,
p->seqid,
&buf[offset + sizeof(f8::BigPackHead)],
&buf[offset + sizeof(f8::PackHead)],
p->packlen);
offset += sizeof(f8::BigPackHead) + p->packlen;
offset += sizeof(f8::PackHead) + p->packlen;
} else {
warning = true;
offset++;
@ -77,7 +75,6 @@ public:
static void CreateGameClientSocket(a8::TcpSession **p)
{
*p = new GSClientSession();
(*p)->SetMaxPacketLen(PACK_MAX);
}
static void GSListeneron_error(a8::TcpListener*, int type, int errorid)
@ -104,18 +101,18 @@ void GSListener::UnInit()
void GSListener::ForwardTargetConnMsg(f8::MsgHdr& hdr)
{
char* buff = (char*)malloc(sizeof(f8::BigPackHead) + hdr.buflen);
f8::BigPackHead* head = (f8::BigPackHead*)buff;
char* buff = (char*)malloc(sizeof(f8::PackHead) + hdr.buflen);
f8::PackHead* head = (f8::PackHead*)buff;
head->packlen = hdr.buflen;
head->msgid = hdr.msgid;
head->seqid = hdr.seqid;
head->magic_code = f8::MAGIC_CODE;
head->rpc_error_code = 0;
if (hdr.buflen > 0) {
memmove(buff + sizeof(f8::BigPackHead), hdr.buf, hdr.buflen);
memmove(buff + sizeof(f8::PackHead), hdr.buf, hdr.buflen);
}
tcp_listener_->SendClientMsg(hdr.socket_handle, buff, sizeof(f8::BigPackHead) + head->packlen);
tcp_listener_->SendClientMsg(hdr.socket_handle, buff, sizeof(f8::PackHead) + head->packlen);
free(buff);
}

2
server/dbproxy/GSListener.h
View File

@ -23,7 +23,7 @@ class GSListener : public a8::Singleton<GSListener>
void SendMsg(unsigned short socket_handle, T& msg)
{
static int msgid = ::f8::Net_GetMessageId(msg);
f8::Net_SendBigMsg(tcp_listener_, socket_handle, 0, msgid, msg);
f8::Net_SendMsg(tcp_listener_, socket_handle, 0, msgid, msg);
}
void ForwardTargetConnMsg(f8::MsgHdr& hdr);

2
third_party/a8engine vendored

@ -1 +1 @@
Subproject commit 6e5c873aecdd5464324818307237bca83860e16a
Subproject commit bc1e1e002cdfbbac07abdf14151afb0bbd8025a8

2
third_party/framework vendored

@ -1 +1 @@
Subproject commit 628e40d32269414703ba6a74b534593611aa5be8
Subproject commit 18133846b6672634219c080064b7a24720d17588