diff --git a/server/wsproxy/mastermgr.cc b/server/wsproxy/mastermgr.cc index 6ff7c05..68d2653 100644 --- a/server/wsproxy/mastermgr.cc +++ b/server/wsproxy/mastermgr.cc @@ -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) { - auto req = GetRequestByContextId(msg.context_id()); + auto req = GetHttpTunnelRequestByContextId(msg.context_id()); if (req) { #ifdef DEBUG 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() ); if (!conn.expired()) { - conn.lock()->ForwardClientMsgEx(req->hdr_copy); - f8::MsgHdr::Destroy(req->hdr_copy); - req->conn = conn; - req->hdr_copy = nullptr; + //conn.lock()->ForwardClientMsgEx(req->hdr_copy); + //f8::MsgHdr::Destroy(req->hdr_copy); + //req->conn = conn; + //req->hdr_copy = nullptr; if (!req->timer_wp.expired()) { f8::Timer::Instance()->FireEvent(req->timer_wp, ALLOC_TARGET_SERVER_SUCCESS_TIMER_EVENT, nullptr); f8::Timer::Instance()->Delete(req->timer_wp); } - RemoveRequest(req->socket_handle); + RemoveHttpTunnelRequest(req->socket_handle); return; } else { abort(); } } else { - RemoveRequest(req->socket_handle); + RemoveHttpTunnelRequest(req->socket_handle); } } }