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-03-24 14:56:01 +08:00
parent 2b25856594
commit 484a5a928a
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/tools/protobuild/ss_msgid.proto
View File

@ -11,6 +11,8 @@ enum SSMessageId_e
_SS_ForceCloseSocket = 13; _SS_ForceCloseSocket = 13;
_SS_WSP_HttpTunnelRequest = 14; _SS_WSP_HttpTunnelRequest = 14;
_SS_MS_HttpTunnelResponse = 15; _SS_MS_HttpTunnelResponse = 15;
_SS_HttpTunnelRequest = 16;
_SS_HttpTunnelResponse = 17;
_SS_CMKcpHandshake = 99; _SS_CMKcpHandshake = 99;
_SS_CMPing = 101; _SS_CMPing = 101;

17
server/tools/protobuild/ss_proto.proto
View File

@ -94,6 +94,23 @@ message SS_MS_HttpTunnelResponse
optional int32 port = 5; 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 message SS_SMRpcError
{ {
optional int32 error_code = 1; optional int32 error_code = 1;

2
server/wsproxy/mastermgr.cc
View File

@ -110,7 +110,7 @@ void MasterMgr::_SS_MS_HttpTunnelResponse(f8::MsgHdr* hdr, const ss::SS_MS_HttpT
auto req = GetHttpTunnelRequestByContextId(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("httpTunnel error_code:%d error_msg:%s host:%s port:%d\n",
{ {
msg.error_code(), msg.error_code(),
msg.error_msg(), msg.error_msg(),