From 45a407e60ca84cead860ba3eb65efeac5c40caa7 Mon Sep 17 00:00:00 2001 From: lwch Date: Fri, 22 Oct 2021 11:49:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3linux=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- code/client/tunnel/vnc/core/process.go | 8 ++++++++ code/client/tunnel/vnc/core/process_windows.go | 9 --------- code/client/tunnel/vnc/core/process_xx.go | 11 ++++++++--- code/client/tunnel/vnc/core/worker_xx.go | 7 +++++++ 4 files changed, 23 insertions(+), 12 deletions(-) diff --git a/code/client/tunnel/vnc/core/process.go b/code/client/tunnel/vnc/core/process.go index 450a25d..7aff928 100644 --- a/code/client/tunnel/vnc/core/process.go +++ b/code/client/tunnel/vnc/core/process.go @@ -19,6 +19,14 @@ const ( listenEnd = 6955 ) +// Process process +type Process struct { + pid int + srv *http.Server + chWrite chan *Msg + chImage chan *ImageData +} + func (p *Process) listenAndServe() (uint16, error) { mux := http.NewServeMux() mux.HandleFunc("/", p.ws) diff --git a/code/client/tunnel/vnc/core/process_windows.go b/code/client/tunnel/vnc/core/process_windows.go index c2808ec..a40cdbd 100644 --- a/code/client/tunnel/vnc/core/process_windows.go +++ b/code/client/tunnel/vnc/core/process_windows.go @@ -5,7 +5,6 @@ import ( "fmt" "image" "natpass/code/client/tunnel/vnc/core/define" - "net/http" "os" "strings" "syscall" @@ -16,14 +15,6 @@ import ( "golang.org/x/sys/windows" ) -// Process process -type Process struct { - pid int - srv *http.Server - chWrite chan *Msg - chImage chan *ImageData -} - func getLogonPid(sessionID uintptr) uint32 { snapshot, err := syscall.CreateToolhelp32Snapshot(syscall.TH32CS_SNAPPROCESS, 0) if err != nil { diff --git a/code/client/tunnel/vnc/core/process_xx.go b/code/client/tunnel/vnc/core/process_xx.go index e104dfe..e013bc1 100644 --- a/code/client/tunnel/vnc/core/process_xx.go +++ b/code/client/tunnel/vnc/core/process_xx.go @@ -2,9 +2,10 @@ package core -// Process process -type Process struct { -} +import ( + "image" + "time" +) // CreateWorkerProcess create worker process func CreateWorkerProcess() (*Process, error) { @@ -14,3 +15,7 @@ func CreateWorkerProcess() (*Process, error) { // Close close process func (p *Process) Close() { } + +func (p *Process) Capture(timeout time.Duration) (*image.RGBA, error) { + return nil, nil +} diff --git a/code/client/tunnel/vnc/core/worker_xx.go b/code/client/tunnel/vnc/core/worker_xx.go index 46fafda..3dbe40a 100644 --- a/code/client/tunnel/vnc/core/worker_xx.go +++ b/code/client/tunnel/vnc/core/worker_xx.go @@ -1,3 +1,10 @@ // +build !windows package core + +type workerOsBased struct { +} + +func (worker *Worker) init() error { + return nil +}