From 4059a1c207ec0fd2ff9c10340b5f1fb833022552 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 5 Apr 2024 14:19:33 +0800 Subject: [PATCH] 1 --- server/imserver_new/proto/ss_msgid.proto | 5 +- server/imserver_new/proto/ss_proto.proto | 21 +++++++++ server/imserver_new/ss/ss.auto_gen.go | 60 ++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/server/imserver_new/proto/ss_msgid.proto b/server/imserver_new/proto/ss_msgid.proto index 7a214f2a..6766e849 100644 --- a/server/imserver_new/proto/ss_msgid.proto +++ b/server/imserver_new/proto/ss_msgid.proto @@ -2,7 +2,6 @@ syntax = "proto2"; package ss; option go_package = ".;ss"; - //消息id定义 enum SSMessageId_e { @@ -11,4 +10,8 @@ enum SSMessageId_e _SS_WSP_SocketDisconnect = 10; _SS_ForceCloseSocket = 13; + _SS_HttpTunnelRequest = 16; + _SS_HttpTunnelResponse = 17; + _SS_BindUpStreamSocket = 20; + } diff --git a/server/imserver_new/proto/ss_proto.proto b/server/imserver_new/proto/ss_proto.proto index 8b6f0353..bd1d4b78 100644 --- a/server/imserver_new/proto/ss_proto.proto +++ b/server/imserver_new/proto/ss_proto.proto @@ -19,3 +19,24 @@ message SS_WSP_SocketDisconnect message SS_ForceCloseSocket { } + +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_BindUpStreamSocket +{ +} diff --git a/server/imserver_new/ss/ss.auto_gen.go b/server/imserver_new/ss/ss.auto_gen.go index d9564a55..a957fc7b 100644 --- a/server/imserver_new/ss/ss.auto_gen.go +++ b/server/imserver_new/ss/ss.auto_gen.go @@ -39,6 +39,9 @@ type MsgHandler interface { SS_Pong(*f5.MsgHdr, *SS_Pong) SS_WSP_SocketDisconnect(*f5.MsgHdr, *SS_WSP_SocketDisconnect) SS_ForceCloseSocket(*f5.MsgHdr, *SS_ForceCloseSocket) + SS_HttpTunnelRequest(*f5.MsgHdr, *SS_HttpTunnelRequest) + SS_HttpTunnelResponse(*f5.MsgHdr, *SS_HttpTunnelResponse) + SS_BindUpStreamSocket(*f5.MsgHdr, *SS_BindUpStreamSocket) } func (this *MsgHandlerImpl) SS_Ping(hdr *f5.MsgHdr, msg *SS_Ping) { @@ -53,6 +56,15 @@ func (this *MsgHandlerImpl) SS_WSP_SocketDisconnect(hdr *f5.MsgHdr, msg *SS_WSP_ func (this *MsgHandlerImpl) SS_ForceCloseSocket(hdr *f5.MsgHdr, msg *SS_ForceCloseSocket) { } +func (this *MsgHandlerImpl) SS_HttpTunnelRequest(hdr *f5.MsgHdr, msg *SS_HttpTunnelRequest) { +} + +func (this *MsgHandlerImpl) SS_HttpTunnelResponse(hdr *f5.MsgHdr, msg *SS_HttpTunnelResponse) { +} + +func (this *MsgHandlerImpl) SS_BindUpStreamSocket(hdr *f5.MsgHdr, msg *SS_BindUpStreamSocket) { +} + func (this *SS_Ping) GetNetMsgId() uint16 { return uint16(SSMessageIdE__SS_Ping) } @@ -69,6 +81,18 @@ func (this *SS_ForceCloseSocket) GetNetMsgId() uint16 { return uint16(SSMessageIdE__SS_ForceCloseSocket) } +func (this *SS_HttpTunnelRequest) GetNetMsgId() uint16 { + return uint16(SSMessageIdE__SS_HttpTunnelRequest) +} + +func (this *SS_HttpTunnelResponse) GetNetMsgId() uint16 { + return uint16(SSMessageIdE__SS_HttpTunnelResponse) +} + +func (this *SS_BindUpStreamSocket) GetNetMsgId() uint16 { + return uint16(SSMessageIdE__SS_BindUpStreamSocket) +} + func init() { handlers[int(SSMessageIdE__SS_Ping)] = &SsNetMsgHandler{ @@ -119,4 +143,40 @@ func init() { }, } + handlers[int(SSMessageIdE__SS_HttpTunnelRequest)] = &SsNetMsgHandler{ + MsgId: int(SSMessageIdE__SS_HttpTunnelRequest), + ParseCb: func (data []byte) interface{} { + msg := &SS_HttpTunnelRequest{} + proto.Unmarshal(data, msg) + return msg + }, + Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { + handler.SS_HttpTunnelRequest(hdr, hdr.Msg.(*SS_HttpTunnelRequest)) + }, + } + + handlers[int(SSMessageIdE__SS_HttpTunnelResponse)] = &SsNetMsgHandler{ + MsgId: int(SSMessageIdE__SS_HttpTunnelResponse), + ParseCb: func (data []byte) interface{} { + msg := &SS_HttpTunnelResponse{} + proto.Unmarshal(data, msg) + return msg + }, + Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { + handler.SS_HttpTunnelResponse(hdr, hdr.Msg.(*SS_HttpTunnelResponse)) + }, + } + + handlers[int(SSMessageIdE__SS_BindUpStreamSocket)] = &SsNetMsgHandler{ + MsgId: int(SSMessageIdE__SS_BindUpStreamSocket), + ParseCb: func (data []byte) interface{} { + msg := &SS_BindUpStreamSocket{} + proto.Unmarshal(data, msg) + return msg + }, + Cb: func (hdr *f5.MsgHdr, handler MsgHandler) { + handler.SS_BindUpStreamSocket(hdr, hdr.Msg.(*SS_BindUpStreamSocket)) + }, + } + } \ No newline at end of file