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:
aozhiwei 2024-08-15 19:31:52 +08:00
parent b991dc9d8c
commit ff39b35c05
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/wsproxy/CMakeLists.txt
View File

@ -20,9 +20,10 @@ endif()
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG") set(CMAKE_CXX_FLAGS_RELEASE "-O3 -Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DNDEBUG")
if (${ASAN}) if (${ASAN})
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -fsanitize=address -fno-omit-frame-pointer") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -fsanitize=address -fno-omit-frame-pointer -fsanitize-recover=address")
message("asan mode")
else() else()
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g -std=gnu++1z -DGAME_ID=${GAME_ID} -DDEBUG -fsanitize-recover=address")
endif() endif()
include_directories( include_directories(

8
server/wsproxy/handlermgr.cc
View File

@ -46,6 +46,13 @@ static void _GMOpsGetKcpSwitch(int socket_handle, std::shared_ptr<f8::JsonHttpRe
request->GetResp()->SetVal("is_open", JsonDataMgr::Instance()->GetKcpConf().open); request->GetResp()->SetVal("is_open", JsonDataMgr::Instance()->GetKcpConf().open);
} }
static void _GMOpsTerminate(int socket_handle, std::shared_ptr<f8::JsonHttpRequest> request)
{
request->GetResp()->SetVal("errcode", 0);
request->GetResp()->SetVal("errmsg", "");
f8::App::Instance()->Terminate();
}
static void _GMHttpTunnelTeamRequest(int socket_handle, std::shared_ptr<f8::JsonHttpRequest> request) static void _GMHttpTunnelTeamRequest(int socket_handle, std::shared_ptr<f8::JsonHttpRequest> request)
{ {
MasterMgr::Instance()->AddHttpTunnelRequest(socket_handle, request); MasterMgr::Instance()->AddHttpTunnelRequest(socket_handle, request);
@ -63,6 +70,7 @@ void HandlerMgr::Init()
RegisterGMMsgHandler("Ops$getNodeId", _GMOpsGetNodeId); RegisterGMMsgHandler("Ops$getNodeId", _GMOpsGetNodeId);
RegisterGMMsgHandler("Ops$setKcpSwitch", _GMOpsSetKcpSwitch); RegisterGMMsgHandler("Ops$setKcpSwitch", _GMOpsSetKcpSwitch);
RegisterGMMsgHandler("Ops$getKcpSwitch", _GMOpsGetKcpSwitch); RegisterGMMsgHandler("Ops$getKcpSwitch", _GMOpsGetKcpSwitch);
RegisterGMMsgHandler("Ops$terminate", _GMOpsTerminate);
RegisterGMMsgHandler("HttpTunnel$teamRequest", _GMHttpTunnelTeamRequest); RegisterGMMsgHandler("HttpTunnel$teamRequest", _GMHttpTunnelTeamRequest);
RegisterGMMsgHandler("HttpTunnel$onlineTeamRequest", _GMHttpTunnelOnlineTeamRequest); RegisterGMMsgHandler("HttpTunnel$onlineTeamRequest", _GMHttpTunnelOnlineTeamRequest);
f8::MsgQueue::Instance()->RegisterCallBack f8::MsgQueue::Instance()->RegisterCallBack