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

1

Browse Source
This commit is contained in:
azw 2023-11-13 06:31:46 +00:00
parent 30fea7fbce
commit 08f2164236
17 changed files with 171 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server/wsproxy/GCListener.cc
View File

@ -22,6 +22,9 @@ public:
virtual void DecodeUserPacket(char* buf, int& offset, unsigned int buflen) override virtual void DecodeUserPacket(char* buf, int& offset, unsigned int buflen) override
{ {
#if 1
is_activite = true;
#endif
//packagelen + msgid + magiccode + msgbody //packagelen + msgid + magiccode + msgbody
//2 + 2 + 4+ xx + \0 + xx //2 + 2 + 4+ xx + \0 + xx
bool warning = false; bool warning = false;
@ -31,14 +34,15 @@ public:
if (buflen - offset < sizeof(f8::PackHead) + p->packlen) { if (buflen - offset < sizeof(f8::PackHead) + p->packlen) {
break; break;
} }
App::Instance()->AddSocketMsg(SF_Client, f8::App::Instance()->AddSocketMsg
socket_handle, (SF_Client,
saddr, socket_handle,
p->msgid, saddr,
p->seqid, p->msgid,
&buf[offset + sizeof(f8::PackHead)], p->seqid,
p->packlen, &buf[offset + sizeof(f8::PackHead)],
ST_Tcp); p->packlen,
ST_Tcp);
offset += sizeof(f8::PackHead) + p->packlen; offset += sizeof(f8::PackHead) + p->packlen;
} else { } else {
warning = true; warning = true;
@ -107,11 +111,6 @@ public:
}; };
static void CreateGameClientSocket(a8::TcpSession **p)
{
*p = new GCClientSession();
}
static void GSListeneron_error(a8::TcpListener*, int type, int errorid) static void GSListeneron_error(a8::TcpListener*, int type, int errorid)
{ {
f8::UdpLog::Instance()->Debug("GCListeneron_error %d %d", {type, errorid}); f8::UdpLog::Instance()->Debug("GCListeneron_error %d %d", {type, errorid});
@ -120,7 +119,7 @@ static void GSListeneron_error(a8::TcpListener*, int type, int errorid)
void GCListener::Init() void GCListener::Init()
{ {
tcp_listener_ = new a8::TcpListener(); tcp_listener_ = new a8::TcpListener();
tcp_listener_->on_create_client_socket = CreateGameClientSocket; tcp_listener_->RegisterSessionClass<GCClientSession>();
tcp_listener_->on_error = GSListeneron_error; tcp_listener_->on_error = GSListeneron_error;
tcp_listener_->bind_address = "0.0.0.0"; tcp_listener_->bind_address = "0.0.0.0";

98
server/wsproxy/app.cc
View File

@ -164,42 +164,6 @@ void App::Update()
SlowerExecute(); SlowerExecute();
} }
void App::AddSocketMsg(SocketFrom_e sockfrom,
int sockhandle,
long ip_saddr,
unsigned short msgid,
unsigned int seqid,
const char *msgbody,
int bodylen,
int tag)
{
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;
p->tag = tag;
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() void App::QuickExecute()
{ {
f8::Timer::Instance()->Update(); f8::Timer::Instance()->Update();
@ -248,6 +212,7 @@ bool App::HasTask()
void App::DispatchMsg() void App::DispatchMsg()
{ {
#if 0
long long starttick = a8::XGetTickCount(); long long starttick = a8::XGetTickCount();
if (!work_node_ && top_node_) { if (!work_node_ && top_node_) {
msg_mutex_->lock(); msg_mutex_->lock();
@ -299,20 +264,21 @@ void App::DispatchMsg()
if (!work_node_) { if (!work_node_) {
working_msgnode_size_ = 0; working_msgnode_size_ = 0;
} }
#endif
} }
void App::ProcessClientMsg(f8::MsgHdr& hdr, int tag) void App::ProcessClientMsg(f8::MsgHdr* hdr, int tag)
{ {
if (hdr.msgid == ss::_SS_CMLogin || if (hdr->msgid == ss::_SS_CMLogin ||
hdr.msgid == ss::_SS_CMReconnect || hdr->msgid == ss::_SS_CMReconnect ||
hdr.msgid == ss::_SS_CMKcpHandshake) { hdr->msgid == ss::_SS_CMKcpHandshake) {
auto down_wp = DownStreamMgr::Instance()->GetDownStream(hdr.socket_handle); auto down_wp = DownStreamMgr::Instance()->GetDownStream(hdr->socket_handle);
if (down_wp.expired()) { if (down_wp.expired()) {
switch (hdr.msgid) { switch (hdr->msgid) {
case ss::_SS_CMLogin: case ss::_SS_CMLogin:
{ {
ss::SS_CMLogin msg; ss::SS_CMLogin msg;
bool ok = msg.ParseFromArray(hdr.buf + hdr.offset, hdr.buflen - hdr.offset); bool ok = msg.ParseFromArray(hdr->buf + hdr->offset, hdr->buflen - hdr->offset);
if (ok) { if (ok) {
MasterMgr::Instance()->RequestTargetServer MasterMgr::Instance()->RequestTargetServer
(hdr, (hdr,
@ -328,7 +294,7 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr, int tag)
case ss::_SS_CMReconnect: case ss::_SS_CMReconnect:
{ {
ss::SS_CMReconnect msg; ss::SS_CMReconnect msg;
bool ok = msg.ParseFromArray(hdr.buf + hdr.offset, hdr.buflen - hdr.offset); bool ok = msg.ParseFromArray(hdr->buf + hdr->offset, hdr->buflen - hdr->offset);
if (ok) { if (ok) {
MasterMgr::Instance()->RequestTargetServer MasterMgr::Instance()->RequestTargetServer
(hdr, (hdr,
@ -344,7 +310,7 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr, int tag)
case ss::_SS_CMKcpHandshake: case ss::_SS_CMKcpHandshake:
{ {
ss::SS_CMKcpHandshake msg; ss::SS_CMKcpHandshake msg;
bool ok = msg.ParseFromArray(hdr.buf + hdr.offset, hdr.buflen - hdr.offset); bool ok = msg.ParseFromArray(hdr->buf + hdr->offset, hdr->buflen - hdr->offset);
if (ok) { if (ok) {
LongSessionMgr::Instance()->_SS_CMKcpHandshake(hdr, msg); LongSessionMgr::Instance()->_SS_CMKcpHandshake(hdr, msg);
} }
@ -358,17 +324,17 @@ void App::ProcessClientMsg(f8::MsgHdr& hdr, int tag)
} }
} }
} else { } else {
auto down_wp = DownStreamMgr::Instance()->GetDownStream(hdr.socket_handle); auto down_wp = DownStreamMgr::Instance()->GetDownStream(hdr->socket_handle);
if (auto down = down_wp.lock(); !down_wp.expired()) { if (auto down = down_wp.lock(); !down_wp.expired()) {
down->ProcCMMsg(hdr, tag); down->ProcCMMsg(hdr, tag);
} }
} }
} }
void App::ProcessMasterServerMsg(f8::MsgHdr& hdr, int tag) void App::ProcessMasterServerMsg(f8::MsgHdr* hdr, int tag)
{ {
f8::NetMsgHandler* handler = f8::GetNetMsgHandler(&HandlerMgr::Instance()->msmsghandler, f8::NetMsgHandler* handler = f8::GetNetMsgHandler(&HandlerMgr::Instance()->msmsghandler,
hdr.msgid); hdr->msgid);
if (handler) { if (handler) {
switch (handler->handlerid) { switch (handler->handlerid) {
case HID_MasterMgr: case HID_MasterMgr:
@ -378,17 +344,17 @@ void App::ProcessMasterServerMsg(f8::MsgHdr& hdr, int tag)
} }
} }
void App::ProcessTargetServerMsg(f8::MsgHdr& hdr, int tag) void App::ProcessTargetServerMsg(f8::MsgHdr* hdr, int tag)
{ {
if (hdr.msgid == ss::_SS_ForceCloseSocket) { if (hdr->msgid == ss::_SS_ForceCloseSocket) {
GCListener::Instance()->ForceCloseClient(hdr.socket_handle); GCListener::Instance()->ForceCloseClient(hdr->socket_handle);
return; return;
} }
if (hdr.msgid == ss::_SS_CMLogin || hdr.msgid == ss::_SS_CMReconnect) { if (hdr->msgid == ss::_SS_CMLogin || hdr->msgid == ss::_SS_CMReconnect) {
DownStreamMgr::Instance()->BindUpStream(hdr.socket_handle, hdr.ip_saddr); DownStreamMgr::Instance()->BindUpStream(hdr->socket_handle, hdr->ip_saddr);
GCListener::Instance()->MarkClient(hdr.socket_handle, true); GCListener::Instance()->MarkClient(hdr->socket_handle, true);
} }
auto down_wp = DownStreamMgr::Instance()->GetDownStream(hdr.socket_handle); auto down_wp = DownStreamMgr::Instance()->GetDownStream(hdr->socket_handle);
if (!down_wp.expired()) { if (!down_wp.expired()) {
down_wp.lock()->ForwardUpStreamMsg(hdr); down_wp.lock()->ForwardUpStreamMsg(hdr);
} }
@ -511,3 +477,25 @@ int App::GetGameId() const
return GAME_ID; return GAME_ID;
#endif #endif
} }
void App::DispatchSocketMsg(f8::MsgHdr* hdr)
{
switch (hdr->sockfrom) {
case SF_Client:
{
ProcessClientMsg(hdr, hdr->tag);
}
break;
case SF_TargetServer:
{
ProcessTargetServerMsg(hdr, hdr->tag);
}
break;
case SF_MasterServer:
{
ProcessMasterServerMsg(hdr, hdr->tag);
}
break;
}
f8::App::Instance()->FreeSocketMsg(hdr);
}

16
server/wsproxy/app.h
View File

@ -24,15 +24,7 @@ public:
virtual void UnInit() override; virtual void UnInit() override;
virtual void Update() override; virtual void Update() override;
virtual bool HasTask() override; 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,
int tag = ST_Tcp);
void AddUdpMsg(a8::UdpPacket* pkt); void AddUdpMsg(a8::UdpPacket* pkt);
@ -49,9 +41,9 @@ private:
void DispatchMsg(); void DispatchMsg();
void DispatchUdpMsg(); void DispatchUdpMsg();
void ProcessClientMsg(f8::MsgHdr& hdr, int tag); void ProcessClientMsg(f8::MsgHdr* hdr, int tag);
void ProcessMasterServerMsg(f8::MsgHdr& hdr, int tag); void ProcessMasterServerMsg(f8::MsgHdr* hdr, int tag);
void ProcessTargetServerMsg(f8::MsgHdr& hdr, int tag); void ProcessTargetServerMsg(f8::MsgHdr* hdr, int tag);
void FreeSocketMsgQueue(); void FreeSocketMsgQueue();
void FreeUdpMsgQueue(); void FreeUdpMsgQueue();

30
server/wsproxy/downstream.cc
View File

@ -23,21 +23,21 @@ void DownStream::ReBindUpStream(std::weak_ptr<UpStream> up)
up_ = up; up_ = up;
} }
void DownStream::ForwardUpStreamMsg(f8::MsgHdr& hdr) void DownStream::ForwardUpStreamMsg(f8::MsgHdr* hdr)
{ {
char* buff = (char*)malloc(sizeof(f8::PackHead) + hdr.buflen); char* buff = (char*)malloc(sizeof(f8::PackHead) + hdr->buflen);
f8::PackHead* head = (f8::PackHead*)buff; f8::PackHead* head = (f8::PackHead*)buff;
head->packlen = hdr.buflen; head->packlen = hdr->buflen;
head->msgid = hdr.msgid; head->msgid = hdr->msgid;
head->seqid = hdr.seqid; head->seqid = hdr->seqid;
head->magic_code = f8::MAGIC_CODE; head->magic_code = f8::MAGIC_CODE;
head->ext_len = hdr.buflen >> 16; head->ext_len = hdr->buflen >> 16;
if (hdr.buflen > 0) { if (hdr->buflen > 0) {
memmove(buff + sizeof(f8::PackHead), hdr.buf, hdr.buflen); memmove(buff + sizeof(f8::PackHead), hdr->buf, hdr->buflen);
} }
if (auto long_session = long_session_wp_.lock(); !long_session_wp_.expired()) { if (auto long_session = long_session_wp_.lock(); !long_session_wp_.expired()) {
if (hdr.msgid == ss::_SS_CMPing) { if (hdr->msgid == ss::_SS_CMPing) {
ss::SS_SMPing msg; ss::SS_SMPing msg;
msg.set_source(1); msg.set_source(1);
{ {
@ -46,10 +46,10 @@ void DownStream::ForwardUpStreamMsg(f8::MsgHdr& hdr)
buff = (char*)malloc(sizeof(f8::PackHead) + msg.ByteSize()); buff = (char*)malloc(sizeof(f8::PackHead) + msg.ByteSize());
f8::PackHead* head = (f8::PackHead*)buff; f8::PackHead* head = (f8::PackHead*)buff;
head->packlen = msg.ByteSize(); head->packlen = msg.ByteSize();
head->msgid = hdr.msgid; head->msgid = hdr->msgid;
head->seqid = hdr.seqid; head->seqid = hdr->seqid;
head->magic_code = f8::MAGIC_CODE; head->magic_code = f8::MAGIC_CODE;
head->ext_len = hdr.buflen >> 16; head->ext_len = hdr->buflen >> 16;
msg.SerializeToArray(buff + sizeof(f8::PackHead), head->packlen); msg.SerializeToArray(buff + sizeof(f8::PackHead), head->packlen);
long_session->GetKcpSession()->SendClientMsg(buff, sizeof(f8::PackHead) + head->packlen); long_session->GetKcpSession()->SendClientMsg(buff, sizeof(f8::PackHead) + head->packlen);
} }
@ -57,7 +57,7 @@ void DownStream::ForwardUpStreamMsg(f8::MsgHdr& hdr)
long_session->GetKcpSession()->SendClientMsg(buff, sizeof(f8::PackHead) + head->packlen); long_session->GetKcpSession()->SendClientMsg(buff, sizeof(f8::PackHead) + head->packlen);
} }
} else { } else {
GCListener::Instance()->SendBuf(hdr.socket_handle, buff, sizeof(f8::PackHead) + head->packlen); GCListener::Instance()->SendBuf(hdr->socket_handle, buff, sizeof(f8::PackHead) + head->packlen);
} }
free(buff); free(buff);
} }
@ -73,9 +73,9 @@ void DownStream::OnClose()
} }
} }
void DownStream::ProcCMMsg(f8::MsgHdr& hdr, int tag) void DownStream::ProcCMMsg(f8::MsgHdr* hdr, int tag)
{ {
if (hdr.msgid == ss::_SS_CMPing && IsLongSession() && tag == ST_Tcp) { if (hdr->msgid == ss::_SS_CMPing && IsLongSession() && tag == ST_Tcp) {
ss::SS_SMPing msg; ss::SS_SMPing msg;
GCListener::Instance()->SendMsgEx(socket_handle_, ss::_SS_CMPing, msg); GCListener::Instance()->SendMsgEx(socket_handle_, ss::_SS_CMPing, msg);
if (!long_session_wp_.expired()) { if (!long_session_wp_.expired()) {

4
server/wsproxy/downstream.h
View File

@ -12,9 +12,9 @@ class DownStream
std::weak_ptr<UpStream> GetUpStream() const { return up_; } std::weak_ptr<UpStream> GetUpStream() const { return up_; }
void ReBindUpStream(std::weak_ptr<UpStream> up); void ReBindUpStream(std::weak_ptr<UpStream> up);
bool IsLongSession() { return is_long_session_; } bool IsLongSession() { return is_long_session_; }
void ProcCMMsg(f8::MsgHdr& hdr, int tag); void ProcCMMsg(f8::MsgHdr* hdr, int tag);
void ForwardUpStreamMsg(f8::MsgHdr& hdr); void ForwardUpStreamMsg(f8::MsgHdr* hdr);
void OnClose(); void OnClose();
private: private:

51
server/wsproxy/handlermgr.cc
View File

@ -16,34 +16,34 @@
static void _GMOpsSelfChecking(std::shared_ptr<f8::JsonHttpRequest> request) static void _GMOpsSelfChecking(std::shared_ptr<f8::JsonHttpRequest> request)
{ {
request->resp_xobj->SetVal("errcode", 0); request->GetResp()->SetVal("errcode", 0);
request->resp_xobj->SetVal("errmsg", ""); request->GetResp()->SetVal("errmsg", "");
request->resp_xobj->SetVal("healthy", 1); request->GetResp()->SetVal("healthy", 1);
request->resp_xobj->SetVal("max_rundelay", 10); request->GetResp()->SetVal("max_rundelay", 10);
} }
static void _GMOpsGetNodeId(std::shared_ptr<f8::JsonHttpRequest> request) static void _GMOpsGetNodeId(std::shared_ptr<f8::JsonHttpRequest> request)
{ {
request->resp_xobj->SetVal("errcode", 0); request->GetResp()->SetVal("errcode", 0);
request->resp_xobj->SetVal("errmsg", ""); request->GetResp()->SetVal("errmsg", "");
request->resp_xobj->SetVal("node_id", f8::App::Instance()->GetNodeId()); request->GetResp()->SetVal("node_id", f8::App::Instance()->GetNodeId());
} }
static void _GMOpsSetKcpSwitch(std::shared_ptr<f8::JsonHttpRequest> request) static void _GMOpsSetKcpSwitch(std::shared_ptr<f8::JsonHttpRequest> request)
{ {
request->resp_xobj->SetVal("errcode", 0); request->GetResp()->SetVal("errcode", 0);
request->resp_xobj->SetVal("errmsg", ""); request->GetResp()->SetVal("errmsg", "");
if (request->params->HasKey("open")) { if (request->GetParams()->HasKey("open")) {
JsonDataMgr::Instance()->SetKcpSwitch(request->params->At("open")->AsXValue().GetInt()); JsonDataMgr::Instance()->SetKcpSwitch(request->GetParams()->At("open")->AsXValue().GetInt());
} }
request->resp_xobj->SetVal("is_open", JsonDataMgr::Instance()->GetKcpConf().open); request->GetResp()->SetVal("is_open", JsonDataMgr::Instance()->GetKcpConf().open);
} }
static void _GMOpsGetKcpSwitch(std::shared_ptr<f8::JsonHttpRequest> request) static void _GMOpsGetKcpSwitch(std::shared_ptr<f8::JsonHttpRequest> request)
{ {
request->resp_xobj->SetVal("errcode", 0); request->GetResp()->SetVal("errcode", 0);
request->resp_xobj->SetVal("errmsg", ""); request->GetResp()->SetVal("errmsg", "");
request->resp_xobj->SetVal("is_open", JsonDataMgr::Instance()->GetKcpConf().open); request->GetResp()->SetVal("is_open", JsonDataMgr::Instance()->GetKcpConf().open);
} }
void HandlerMgr::Init() void HandlerMgr::Init()
@ -89,18 +89,17 @@ void HandlerMgr::ProcGMMsg(unsigned long saddr, int sockhandle,
std::string msgname = a8::Get(request, "c").GetString() + "$" + a8::Get(request, "a").GetString(); std::string msgname = a8::Get(request, "c").GetString() + "$" + a8::Get(request, "a").GetString();
auto itr = gmhandlers_.find(msgname); auto itr = gmhandlers_.find(msgname);
if (itr != gmhandlers_.end()) { if (itr != gmhandlers_.end()) {
auto request = std::make_shared<f8::JsonHttpRequest>(); auto request = std::make_shared<f8::JsonHttpRequest>
request->saddr = saddr; (
request->socket_handle = sockhandle; saddr,
request->query_str = querystr; url,
request->params->ReadFromUrlQueryString(querystr); querystr,
[sockhandle] (const a8::Args& args)
{
std::string data = args.Get<std::string>(0);
GCListener::Instance()->SendText(sockhandle, a8::HttpResponse(data));
});
itr->second(request); itr->second(request);
if (!request->pending){
std::string response;
request->resp_xobj->ToJsonStr(response);
GCListener::Instance()->SendText(sockhandle, a8::HttpResponse(response));
}
} else { } else {
GCListener::Instance()->SendText(sockhandle, a8::HttpResponse("{}")); GCListener::Instance()->SendText(sockhandle, a8::HttpResponse("{}"));
} }

38
server/wsproxy/kcpsession.cc
View File

@ -131,15 +131,16 @@ void KcpSession::DecodeUserPacketOld(char* buf, int& offset, unsigned int buflen
if (buflen - offset < sizeof(f8::PackHead) + p->packlen + GetSecretKeyLen()) { if (buflen - offset < sizeof(f8::PackHead) + p->packlen + GetSecretKeyLen()) {
break; break;
} }
App::Instance()->AddSocketMsg(SF_Client, f8::App::Instance()->AddSocketMsg
socket_handle_, (SF_Client,
0, socket_handle_,
//saddr, 0,
p->msgid, //saddr,
p->seqid, p->msgid,
&buf[offset + sizeof(f8::PackHead) + GetSecretKeyLen()], p->seqid,
p->packlen, &buf[offset + sizeof(f8::PackHead) + GetSecretKeyLen()],
ST_Udp); p->packlen,
ST_Udp);
offset += sizeof(f8::PackHead) + p->packlen + GetSecretKeyLen(); offset += sizeof(f8::PackHead) + p->packlen + GetSecretKeyLen();
} else { } else {
warning = true; warning = true;
@ -162,15 +163,16 @@ void KcpSession::DecodeUserPacketNew(char* buf, int& offset, unsigned int buflen
if (buflen - offset < sizeof(f8::PackHead) + p->packlen) { if (buflen - offset < sizeof(f8::PackHead) + p->packlen) {
break; break;
} }
App::Instance()->AddSocketMsg(SF_Client, f8::App::Instance()->AddSocketMsg
socket_handle_, (SF_Client,
0, socket_handle_,
//saddr, 0,
p->msgid, //saddr,
p->seqid, p->msgid,
&buf[offset + sizeof(f8::PackHead)], p->seqid,
p->packlen, &buf[offset + sizeof(f8::PackHead)],
ST_Udp); p->packlen,
ST_Udp);
offset += sizeof(f8::PackHead) + p->packlen; offset += sizeof(f8::PackHead) + p->packlen;
} else { } else {
warning = true; warning = true;

4
server/wsproxy/longsession.cc
View File

@ -8,10 +8,10 @@
#include "ss_msgid.pb.h" #include "ss_msgid.pb.h"
#include "ss_proto.pb.h" #include "ss_proto.pb.h"
void LongSession::Init(f8::MsgHdr& hdr, const ss::SS_CMKcpHandshake& msg) void LongSession::Init(f8::MsgHdr* hdr, const ss::SS_CMKcpHandshake& msg)
{ {
kcp_session_ = std::make_shared<KcpSession>(); kcp_session_ = std::make_shared<KcpSession>();
kcp_session_->Init(hdr.socket_handle, msg.secret_key_place()); kcp_session_->Init(hdr->socket_handle, msg.secret_key_place());
} }
void LongSession::UnInit() void LongSession::UnInit()

2
server/wsproxy/longsession.h
View File

@ -11,7 +11,7 @@ class LongSession
public: public:
void Init(f8::MsgHdr& hdr, const ss::SS_CMKcpHandshake& msg); void Init(f8::MsgHdr* hdr, const ss::SS_CMKcpHandshake& msg);
void UnInit(); void UnInit();
void Update(long long tick); void Update(long long tick);

10
server/wsproxy/longsessionmgr.cc
View File

@ -53,17 +53,17 @@ void LongSessionMgr::Update()
} }
} }
void LongSessionMgr::_SS_CMKcpHandshake(f8::MsgHdr& hdr, const ss::SS_CMKcpHandshake& msg) void LongSessionMgr::_SS_CMKcpHandshake(f8::MsgHdr* hdr, const ss::SS_CMKcpHandshake& msg)
{ {
ss::SS_SMKcpHandshake respmsg; ss::SS_SMKcpHandshake respmsg;
respmsg.set_errcode(0); respmsg.set_errcode(0);
if (!JsonDataMgr::Instance()->GetKcpConf().open) { if (!JsonDataMgr::Instance()->GetKcpConf().open) {
respmsg.set_errcode(1); respmsg.set_errcode(1);
respmsg.set_errmsg("not support kcp"); respmsg.set_errmsg("not support kcp");
GCListener::Instance()->SendMsgEx(hdr.socket_handle, ss::_SS_CMKcpHandshake, respmsg); GCListener::Instance()->SendMsgEx(hdr->socket_handle, ss::_SS_CMKcpHandshake, respmsg);
return; return;
} }
if (GetSession(hdr.socket_handle)) { if (GetSession(hdr->socket_handle)) {
#ifdef DEBUG #ifdef DEBUG
abort(); abort();
#endif #endif
@ -77,9 +77,9 @@ void LongSessionMgr::_SS_CMKcpHandshake(f8::MsgHdr& hdr, const ss::SS_CMKcpHands
respmsg.set_secret_key(session->GetKcpSession()->GetSecretKeyDataPtr(), KcpSession::GetSecretKeyLen()); respmsg.set_secret_key(session->GetKcpSession()->GetSecretKeyDataPtr(), KcpSession::GetSecretKeyLen());
respmsg.set_remote_host(JsonDataMgr::Instance()->GetUdpHost()); respmsg.set_remote_host(JsonDataMgr::Instance()->GetUdpHost());
respmsg.set_remote_port(JsonDataMgr::Instance()->GetUdpPort()); respmsg.set_remote_port(JsonDataMgr::Instance()->GetUdpPort());
GCListener::Instance()->SendMsgEx(hdr.socket_handle, ss::_SS_CMKcpHandshake, respmsg); GCListener::Instance()->SendMsgEx(hdr->socket_handle, ss::_SS_CMKcpHandshake, respmsg);
{ {
int socket_handle = hdr.socket_handle; int socket_handle = hdr->socket_handle;
f8::Timer::Instance()->SetTimeout f8::Timer::Instance()->SetTimeout
( (
1000 * 30, 1000 * 30,

2
server/wsproxy/longsessionmgr.h
View File

@ -26,7 +26,7 @@ class LongSessionMgr : public a8::Singleton<LongSessionMgr>
void UnInit(); void UnInit();
void Update(); void Update();
void _SS_CMKcpHandshake(f8::MsgHdr& hdr, const ss::SS_CMKcpHandshake& msg); void _SS_CMKcpHandshake(f8::MsgHdr* hdr, const ss::SS_CMKcpHandshake& msg);
void ProcUdpPacket(a8::UdpPacket* pkt); void ProcUdpPacket(a8::UdpPacket* pkt);
std::shared_ptr<LongSession> GetSession(int socket_handle); std::shared_ptr<LongSession> GetSession(int socket_handle);
std::shared_ptr<a8::UdpListener> GetUdpListener() { return udp_listener_; } std::shared_ptr<a8::UdpListener> GetUdpListener() { return udp_listener_; }

16
server/wsproxy/master.cc
View File

@ -114,13 +114,15 @@ void Master::on_socketread(a8::TcpClient* sender, char* buf, unsigned int len)
if (recv_bufflen_ - offset < sizeof(f8::PackHead) + p->packlen) { if (recv_bufflen_ - offset < sizeof(f8::PackHead) + p->packlen) {
break; break;
} }
App::Instance()->AddSocketMsg(SF_MasterServer, f8::App::Instance()->AddSocketMsg
0, (SF_MasterServer,
instance_id, 0,
p->msgid, instance_id,
p->seqid, p->msgid,
&recv_buff_[offset + sizeof(f8::PackHead)], p->seqid,
p->packlen); &recv_buff_[offset + sizeof(f8::PackHead)],
p->packlen,
0);
offset += sizeof(f8::PackHead) + p->packlen; offset += sizeof(f8::PackHead) + p->packlen;
} else { } else {
warning = true; warning = true;

14
server/wsproxy/mastermgr.cc
View File

@ -54,7 +54,7 @@ void MasterMgr::UnInit()
mastersvr_hash_.clear(); mastersvr_hash_.clear();
} }
void MasterMgr::_SS_MS_ResponseTargetServer(f8::MsgHdr& hdr, const ss::SS_MS_ResponseTargetServer& msg) void MasterMgr::_SS_MS_ResponseTargetServer(f8::MsgHdr* hdr, const ss::SS_MS_ResponseTargetServer& msg)
{ {
auto req = GetRequestByContextId(msg.context_id()); auto req = GetRequestByContextId(msg.context_id());
if (req) { if (req) {
@ -91,7 +91,7 @@ std::shared_ptr<Master> MasterMgr::GetConnById(int instance_id)
return itr != mastersvr_hash_.end() ? itr->second : nullptr; return itr != mastersvr_hash_.end() ? itr->second : nullptr;
} }
void MasterMgr::RequestTargetServer(f8::MsgHdr& hdr, void MasterMgr::RequestTargetServer(f8::MsgHdr* hdr,
const std::string& team_id, const std::string& team_id,
const std::string& account_id, const std::string& account_id,
const std::string& session_id, const std::string& session_id,
@ -99,7 +99,7 @@ void MasterMgr::RequestTargetServer(f8::MsgHdr& hdr,
int is_reconnect, int is_reconnect,
int proto_version) int proto_version)
{ {
if (GetRequestBySocket(hdr.socket_handle)) { if (GetRequestBySocket(hdr->socket_handle)) {
return; return;
} }
unsigned int code = 0; unsigned int code = 0;
@ -122,10 +122,10 @@ void MasterMgr::RequestTargetServer(f8::MsgHdr& hdr,
++curr_context_id_; ++curr_context_id_;
auto req = std::make_shared<RequestTarget>(); auto req = std::make_shared<RequestTarget>();
req->context_id = curr_context_id_; req->context_id = curr_context_id_;
req->socket_handle = hdr.socket_handle; req->socket_handle = hdr->socket_handle;
req->account_id = account_id; req->account_id = account_id;
req->req_tick = a8::XGetTickCount(); req->req_tick = a8::XGetTickCount();
req->hdr_copy = hdr.Clone(); req->hdr_copy = hdr->Clone();
ss::SS_WSP_RequestTargetServer msg; ss::SS_WSP_RequestTargetServer msg;
msg.set_context_id(curr_context_id_); msg.set_context_id(curr_context_id_);
@ -139,14 +139,14 @@ void MasterMgr::RequestTargetServer(f8::MsgHdr& hdr,
std::string url; std::string url;
std::string query_str; std::string query_str;
{ {
GCListener::Instance()->GetWebSocketUrl(hdr.socket_handle, url, query_str); GCListener::Instance()->GetWebSocketUrl(hdr->socket_handle, url, query_str);
} }
msg.set_url(url); msg.set_url(url);
msg.set_query_str(query_str); msg.set_query_str(query_str);
#endif #endif
svr->SendMsg(msg); svr->SendMsg(msg);
pending_socket_hash_[hdr.socket_handle] = req; pending_socket_hash_[hdr->socket_handle] = req;
assert(pending_context_hash_.find(curr_context_id_) == pending_context_hash_.end()); assert(pending_context_hash_.find(curr_context_id_) == pending_context_hash_.end());
pending_context_hash_[curr_context_id_] = req; pending_context_hash_[curr_context_id_] = req;
req->timer_wp = f8::Timer::Instance()->SetTimeoutWp req->timer_wp = f8::Timer::Instance()->SetTimeoutWp

4
server/wsproxy/mastermgr.h
View File

@ -26,8 +26,8 @@ class MasterMgr : public a8::Singleton<MasterMgr>
void Init(); void Init();
void UnInit(); void UnInit();
void _SS_MS_ResponseTargetServer(f8::MsgHdr& hdr, const ss::SS_MS_ResponseTargetServer& msg); void _SS_MS_ResponseTargetServer(f8::MsgHdr* hdr, const ss::SS_MS_ResponseTargetServer& msg);
void RequestTargetServer(f8::MsgHdr& hdr, void RequestTargetServer(f8::MsgHdr* hdr,
const std::string& team_id, const std::string& team_id,
const std::string& account_id, const std::string& account_id,
const std::string& session_id, const std::string& session_id,

38
server/wsproxy/upstream.cc
View File

@ -99,7 +99,7 @@ void UpStream::SendStockMsg()
delete pdelnode->msg; delete pdelnode->msg;
} }
if (pdelnode->hdr) { if (pdelnode->hdr) {
ForwardClientMsg(*pdelnode->hdr); ForwardClientMsg(pdelnode->hdr);
f8::MsgHdr::Destroy(pdelnode->hdr); f8::MsgHdr::Destroy(pdelnode->hdr);
pdelnode->hdr = nullptr; pdelnode->hdr = nullptr;
} }
@ -107,23 +107,23 @@ void UpStream::SendStockMsg()
} }
} }
void UpStream::ForwardClientMsg(f8::MsgHdr& hdr) void UpStream::ForwardClientMsg(f8::MsgHdr* hdr)
{ {
char* buff = (char*)malloc(sizeof(f8::WSProxyPackHead_C) + hdr.buflen); char* buff = (char*)malloc(sizeof(f8::WSProxyPackHead_C) + hdr->buflen);
memset(buff, 0, sizeof(f8::WSProxyPackHead_C)); memset(buff, 0, sizeof(f8::WSProxyPackHead_C));
f8::WSProxyPackHead_C* head = (f8::WSProxyPackHead_C*)buff; f8::WSProxyPackHead_C* head = (f8::WSProxyPackHead_C*)buff;
head->packlen = hdr.buflen; head->packlen = hdr->buflen;
head->msgid = hdr.msgid; head->msgid = hdr->msgid;
head->seqid = hdr.seqid; head->seqid = hdr->seqid;
head->magic_code = f8::MAGIC_CODE; head->magic_code = f8::MAGIC_CODE;
#if 0 #if 0
head->rpc_error_code = 0; head->rpc_error_code = 0;
#endif #endif
head->socket_handle = hdr.socket_handle; head->socket_handle = hdr->socket_handle;
head->ip_saddr = hdr.ip_saddr; head->ip_saddr = hdr->ip_saddr;
if (hdr.buflen > 0) { if (hdr->buflen > 0) {
memmove(buff + sizeof(f8::WSProxyPackHead_C), hdr.buf, hdr.buflen); memmove(buff + sizeof(f8::WSProxyPackHead_C), hdr->buf, hdr->buflen);
} }
tcp_client_->SendBuff(buff, sizeof(f8::WSProxyPackHead_C) + head->packlen); tcp_client_->SendBuff(buff, sizeof(f8::WSProxyPackHead_C) + head->packlen);
@ -136,7 +136,7 @@ void UpStream::ForwardClientMsgEx(f8::MsgHdr* hdr)
if (top_node_) { if (top_node_) {
SendStockMsg(); SendStockMsg();
} }
ForwardClientMsg(*hdr); ForwardClientMsg(hdr);
if (hdr->buf) { if (hdr->buf) {
free((char*)hdr->buf); free((char*)hdr->buf);
} }
@ -221,13 +221,15 @@ void UpStream::on_socketread(a8::TcpClient* sender, char* buf, unsigned int len)
if (recv_bufflen_ - offset < sizeof(f8::WSProxyPackHead_S) + real_len) { if (recv_bufflen_ - offset < sizeof(f8::WSProxyPackHead_S) + real_len) {
break; break;
} }
App::Instance()->AddSocketMsg(SF_TargetServer, f8::App::Instance()->AddSocketMsg
p->socket_handle, (SF_TargetServer,
instance_id, p->socket_handle,
p->msgid, instance_id,
p->seqid, p->msgid,
&recv_buff_[offset + sizeof(f8::WSProxyPackHead_S)], p->seqid,
real_len); &recv_buff_[offset + sizeof(f8::WSProxyPackHead_S)],
real_len,
0);
offset += sizeof(f8::WSProxyPackHead_S) + real_len; offset += sizeof(f8::WSProxyPackHead_S) + real_len;
} else { } else {
warning = true; warning = true;

2
server/wsproxy/upstream.h
View File

@ -50,7 +50,7 @@ class UpStream
} }
void SendStockMsg(); void SendStockMsg();
void ForwardClientMsg(f8::MsgHdr& hdr); void ForwardClientMsg(f8::MsgHdr* hdr);
void ForwardClientMsgEx(f8::MsgHdr* hdr); void ForwardClientMsgEx(f8::MsgHdr* hdr);
private: private:

2
third_party/f8 vendored

@ -1 +1 @@
Subproject commit 1c141d8817c21820eb0e79aad3279245a8a72866 Subproject commit e6570ff2d38b71d20328d875d02237a3a908512d