From 6917beb0d252f380e32c30c73b6e2bbeefcb08d7 Mon Sep 17 00:00:00 2001
From: Bolke de Bruin <bolke@xs4all.nl>
Date: Sat, 6 Aug 2022 11:45:48 +0200
Subject: [PATCH] Testing
---
cmd/rdpgw/protocol/server.go | 3 +++
dev/docker/Dockerfile | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/cmd/rdpgw/protocol/server.go b/cmd/rdpgw/protocol/server.go
index 4f9c119..b8371e9 100644
--- a/cmd/rdpgw/protocol/server.go
+++ b/cmd/rdpgw/protocol/server.go
@@ -143,6 +143,7 @@ func (s *Server) Process(ctx context.Context) error {
go forward(s.Remote, s.Session.TransportOut)
s.State = SERVER_STATE_CHANNEL_CREATE
case PKT_TYPE_DATA:
+ log.Printf("Data received")
if 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")
@@ -167,6 +168,8 @@ func (s *Server) Process(ctx context.Context) error {
s.Session.TransportIn.Close()
s.Session.TransportOut.Close()
s.State = SERVER_STATE_CLOSED
+ log.Printf("Channel closed")
+ return nil
default:
log.Printf("Unknown packet (size %d): %x", sz, pkt)
}
diff --git a/dev/docker/Dockerfile b/dev/docker/Dockerfile
index 5079da2..4c7dfe3 100644
--- a/dev/docker/Dockerfile
+++ b/dev/docker/Dockerfile
@@ -27,7 +27,7 @@ RUN adduser --disabled-password --gecos "" --home /opt/rdpgw --uid 1001 rdpgw
# build rdpgw and set rights
RUN git clone https://github.com/bolkedebruin/rdpgw.git /app && \
cd /app && \
- go mod tidy && \
+ go mod tidy -compat=1.17 && \
CGO_ENABLED=0 GOOS=linux go build -trimpath -tags '' -ldflags '' -o '/opt/rdpgw/rdpgw' ./cmd/rdpgw && \
chmod +x /opt/rdpgw/rdpgw && \
chown -R 1001 /opt/rdpgw
--
GitLab