sendnrw/rdpgw
2
0
Fork 0
mirror of https://github.com/bolkedebruin/rdpgw.git synced 2026-03-30 07:26:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

channel testing

Browse Source
This commit is contained in:
Bolke de Bruin
2022-08-06 12:33:23 +02:00
parent b83f876687
commit ce84fd9cf1
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmd/rdpgw/protocol/server.go
View File

@@ -143,7 +143,6 @@ func (s *Server) Process(ctx context.Context) error {
go forward(s.Remote, s.Session.TransportOut) go forward(s.Remote, s.Session.TransportOut)
s.State = SERVER_STATE_CHANNEL_CREATE s.State = SERVER_STATE_CHANNEL_CREATE
case PKT_TYPE_DATA: case PKT_TYPE_DATA:
log.Printf("Data received")
if s.State < SERVER_STATE_CHANNEL_CREATE { if s.State < SERVER_STATE_CHANNEL_CREATE {
log.Printf("Data received while in wrong state %d != %d", s.State, SERVER_STATE_CHANNEL_CREATE) log.Printf("Data received while in wrong state %d != %d", s.State, SERVER_STATE_CHANNEL_CREATE)
return errors.New("wrong state") return errors.New("wrong state")
@@ -165,9 +164,10 @@ func (s *Server) Process(ctx context.Context) error {
log.Printf("Channel closed while in wrong state %d != %d", s.State, SERVER_STATE_OPENED) log.Printf("Channel closed while in wrong state %d != %d", s.State, SERVER_STATE_OPENED)
return errors.New("wrong state") return errors.New("wrong state")
} }
log.Printf("Channel closed") msg := s.channelCloseResponse()
s.Session.TransportIn.Close() s.Session.TransportOut.WritePacket(msg)
s.Session.TransportOut.Close() //s.Session.TransportIn.Close()
//s.Session.TransportOut.Close()
s.State = SERVER_STATE_CLOSED s.State = SERVER_STATE_CLOSED
return nil return nil
default: default:
@@ -314,6 +314,25 @@ func (s *Server) channelResponse() []byte {
return createPacket(PKT_TYPE_CHANNEL_RESPONSE, buf.Bytes()) return createPacket(PKT_TYPE_CHANNEL_RESPONSE, buf.Bytes())
} }
func (s *Server) channelCloseResponse() []byte {
buf := new(bytes.Buffer)
binary.Write(buf, binary.LittleEndian, uint32(0)) // error code
binary.Write(buf, binary.LittleEndian, uint16(HTTP_CHANNEL_RESPONSE_FIELD_CHANNELID)) // fields present
binary.Write(buf, binary.LittleEndian, uint16(0)) // reserved
// channel id is required for Windows clients
binary.Write(buf, binary.LittleEndian, uint32(1)) // channel id
// optional fields
// channel id uint32 (4)
// udp port uint16 (2)
// udp auth cookie 1 byte for side channel
// length uint16
return createPacket(PKT_TYPE_CLOSE_CHANNEL_RESPONSE, buf.Bytes())
}
func makeRedirectFlags(flags RedirectFlags) int { func makeRedirectFlags(flags RedirectFlags) int {
var redir = 0 var redir = 0