From 484a5a928a97009e45de1f756198aa759860cc9f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sun, 24 Mar 2024 14:56:01 +0800 Subject: [PATCH] 1 --- server/tools/protobuild/ss_msgid.proto | 2 ++ server/tools/protobuild/ss_proto.proto | 17 +++++++++++++++++ server/wsproxy/mastermgr.cc | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/server/tools/protobuild/ss_msgid.proto b/server/tools/protobuild/ss_msgid.proto index 940f319..ef3f819 100644 --- a/server/tools/protobuild/ss_msgid.proto +++ b/server/tools/protobuild/ss_msgid.proto @@ -11,6 +11,8 @@ enum SSMessageId_e _SS_ForceCloseSocket = 13; _SS_WSP_HttpTunnelRequest = 14; _SS_MS_HttpTunnelResponse = 15; + _SS_HttpTunnelRequest = 16; + _SS_HttpTunnelResponse = 17; _SS_CMKcpHandshake = 99; _SS_CMPing = 101; diff --git a/server/tools/protobuild/ss_proto.proto b/server/tools/protobuild/ss_proto.proto index e78e8b1..da7e761 100644 --- a/server/tools/protobuild/ss_proto.proto +++ b/server/tools/protobuild/ss_proto.proto @@ -94,6 +94,23 @@ message SS_MS_HttpTunnelResponse optional int32 port = 5; } +message SS_HttpTunnelRequest +{ + optional int64 context_id = 1; + optional int32 socket_handle = 2; + optional string url = 3; + optional string query_str = 4; +} + +message SS_HttpTunnelResponse +{ + optional int32 error_code = 1; + optional string error_msg = 2; + optional int64 context_id = 3; + optional int32 socket_handle = 4; + optional string response = 5; +} + message SS_SMRpcError { optional int32 error_code = 1; diff --git a/server/wsproxy/mastermgr.cc b/server/wsproxy/mastermgr.cc index 68d2653..19a048c 100644 --- a/server/wsproxy/mastermgr.cc +++ b/server/wsproxy/mastermgr.cc @@ -110,7 +110,7 @@ void MasterMgr::_SS_MS_HttpTunnelResponse(f8::MsgHdr* hdr, const ss::SS_MS_HttpT auto req = GetHttpTunnelRequestByContextId(msg.context_id()); if (req) { #ifdef DEBUG - a8::XPrintf("error_code:%d error_msg:%s host:%s port:%d\n", + a8::XPrintf("httpTunnel error_code:%d error_msg:%s host:%s port:%d\n", { msg.error_code(), msg.error_msg(),