This commit is contained in:
aozhiwei 2024-03-24 14:21:03 +08:00
parent 9606fc7a1c
commit 2b25856594

View File

@ -107,7 +107,7 @@ void MasterMgr::_SS_MS_ResponseTargetServer(f8::MsgHdr* hdr, const ss::SS_MS_Res
void MasterMgr::_SS_MS_HttpTunnelResponse(f8::MsgHdr* hdr, const ss::SS_MS_HttpTunnelResponse& msg) void MasterMgr::_SS_MS_HttpTunnelResponse(f8::MsgHdr* hdr, const ss::SS_MS_HttpTunnelResponse& msg)
{ {
auto req = GetRequestByContextId(msg.context_id()); auto req = GetHttpTunnelRequestByContextId(msg.context_id());
if (req) { if (req) {
#ifdef DEBUG #ifdef DEBUG
a8::XPrintf("error_code:%d error_msg:%s host:%s port:%d\n", a8::XPrintf("error_code:%d error_msg:%s host:%s port:%d\n",
@ -125,23 +125,23 @@ void MasterMgr::_SS_MS_HttpTunnelResponse(f8::MsgHdr* hdr, const ss::SS_MS_HttpT
msg.port() msg.port()
); );
if (!conn.expired()) { if (!conn.expired()) {
conn.lock()->ForwardClientMsgEx(req->hdr_copy); //conn.lock()->ForwardClientMsgEx(req->hdr_copy);
f8::MsgHdr::Destroy(req->hdr_copy); //f8::MsgHdr::Destroy(req->hdr_copy);
req->conn = conn; //req->conn = conn;
req->hdr_copy = nullptr; //req->hdr_copy = nullptr;
if (!req->timer_wp.expired()) { if (!req->timer_wp.expired()) {
f8::Timer::Instance()->FireEvent(req->timer_wp, f8::Timer::Instance()->FireEvent(req->timer_wp,
ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT, ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT,
nullptr); nullptr);
f8::Timer::Instance()->Delete(req->timer_wp); f8::Timer::Instance()->Delete(req->timer_wp);
} }
RemoveRequest(req->socket_handle); RemoveHttpTunnelRequest(req->socket_handle);
return; return;
} else { } else {
abort(); abort();
} }
} else { } else {
RemoveRequest(req->socket_handle); RemoveHttpTunnelRequest(req->socket_handle);
} }
} }
} }