.circleci/config.yml

@@ -1,129 +0,0 @@
-version: 2 # use CircleCI 2.0
-jobs: # basic units of work in a run
-  build: # runs not using Workflows must have a `build` job as entry point
-    docker: # run the steps with Docker
-      # CircleCI Go images available at: https://hub.docker.com/r/circleci/golang/
-      - image: circleci/golang:1.12
-      # CircleCI PostgreSQL images available at: https://hub.docker.com/r/circleci/postgres/
-      - image: circleci/postgres:9.6-alpine
-        environment: # environment variables for primary container
-          POSTGRES_USER: circleci-demo-go
-          POSTGRES_DB: circle_test
-
-    parallelism: 2
-
-    environment: # environment variables for the build itself
-      TEST_RESULTS: /tmp/test-results # path to where test results will be saved
-
-    steps: # steps that comprise the `build` job
-      - checkout # check out source code to working directory
-      - run: mkdir -p $TEST_RESULTS # create the test results directory
-
-      - restore_cache: # restores saved cache if no changes are detected since last run
-          keys:
-            - go-mod-v4-{{ checksum "go.sum" }}
-
-      #  Wait for Postgres to be ready before proceeding
-      - run:
-          name: Waiting for Postgres to be ready
-          command: dockerize -wait tcp://localhost:5432 -timeout 1m
-
-      - run:
-          name: Run unit tests
-          environment: # environment variables for the database url and path to migration files
-            CONTACTS_DB_URL: "postgres://circleci-demo-go@localhost:5432/circle_test?sslmode=disable"
-            CONTACTS_DB_MIGRATIONS: /home/circleci/project/db/migrations
-
-          # store the results of our tests in the $TEST_RESULTS directory
-          command: |
-            PACKAGE_NAMES=$(go list ./... | circleci tests split --split-by=timings --timings-type=classname)
-            gotestsum --junitfile ${TEST_RESULTS}/gotestsum-report.xml -- $PACKAGE_NAMES
-    
-      #  Build 
-      - run:
-          name: Build and package all OS flavors
-          command: |
-              #!/bin/bash
-              sum="sha1sum"
-
-              # VERSION=`date -u +%Y%m%d`
-              VERSION="v1.11"
-              LDFLAGS="-X main.VERSION=$VERSION -s -w"
-              GCFLAGS=""
-
-              if ! hash sha1sum 2>/dev/null; then
-                if ! hash shasum 2>/dev/null; then
-                  echo "I can't see 'sha1sum' or 'shasum'"
-                  echo "Please install one of them!"
-                  exit
-                fi
-                sum="shasum"
-              fi
-
-              UPX=false
-              if hash upx 2>/dev/null; then
-                UPX=true
-              fi
-
-
-              OSES=( linux darwin windows )
-              ARCHS=(amd64 386 )
-              for os in ${OSES[@]}; do
-                for arch in ${ARCHS[@]}; do
-                  suffix=""
-                  if [ "$os" == "windows" ]
-                  then
-                    suffix=".exe"
-                  fi
-
-                  env CGO_ENABLED=0 GOOS=$os GOARCH=$arch go build -ldflags "$LDFLAGS" -gcflags "$GCFLAGS" -o ./dist/${os}_${arch}/recorder${suffix} ./recorder/cmd
-                  env CGO_ENABLED=0 GOOS=$os GOARCH=$arch go build -ldflags "$LDFLAGS" -gcflags "$GCFLAGS" -o ./dist/${os}_${arch}/player${suffix} ./player/cmd
-                  env CGO_ENABLED=0 GOOS=$os GOARCH=$arch go build -ldflags "$LDFLAGS" -gcflags "$GCFLAGS" -o ./dist/${os}_${arch}/proxy${suffix} ./proxy/cmd
-                
-                    if $UPX; then upx -9 client_${os}_${arch}${suffix} server_${os}_${arch}${suffix};fi
-                  # tar -zcf ./dist/${CIRCLE_PROJECT_REPONAME}-${os}-${arch}-$VERSION.tar.gz ./dist/${os}_${arch}/proxy${suffix} ./dist/${os}_${arch}/player${suffix} ./dist/${os}_${arch}/recorder${suffix}
-                      cd dist/${os}_${arch}/
-                      zip -D -q -r ../${CIRCLE_PROJECT_REPONAME}-${os}-${arch}-$VERSION.zip proxy${suffix} player${suffix} recorder${suffix}
-                      cd ../..
-                      export
-                    $sum ./dist/${CIRCLE_PROJECT_REPONAME}-${os}-${arch}-$VERSION.zip
-                    rm -rf ./dist/${os}_${arch}/
-                done
-              done
-
-      - store_artifacts: # upload test summary for display in Artifacts
-          path: ./dist
-          destination: release-artifacts
-
-      # - run: make # pull and build dependencies for the project
-
-      # - save_cache:
-      #     key: go-mod-v4-{{ checksum "go.sum" }}
-      #     paths:
-      #       - "/go/pkg/mod"
-
-      # - run:
-      #     name: Start service
-      #     environment:
-      #       CONTACTS_DB_URL: "postgres://circleci-demo-go@localhost:5432/circle_test?sslmode=disable"
-      #       CONTACTS_DB_MIGRATIONS: /home/circleci/project/db/migrations
-      #     command: ./workdir/contacts
-      #     background: true # keep service running and proceed to next step
-
-      # - run:
-      #     name: Validate service is working
-      #     command: |
-      #       sleep 5
-      #       curl --retry 10 --retry-delay 1 -X POST --header "Content-Type: application/json" -d '{"email":"test@example.com","name":"Test User"}' http://localhost:8080/contacts
-
-      # - store_artifacts: # upload test summary for display in Artifacts
-      #     path: /tmp/test-results
-      #     destination: raw-test-output
-
-      # - store_test_results: # upload test results for display in Test Summary
-      #     path: /tmp/test-results
-workflows:
-  version: 2
-  build-workflow:
-    jobs:
-      - build

README.md

@@ -1,10 +1,9 @@
-# VncProxy [![CircleCI](https://circleci.com/gh/amitbet/vncproxy/tree/master.svg?style=shield)](https://circleci.com/gh/amitbet/vncproxy/tree/master) [![MIT Licensed](https://img.shields.io/badge/license-MIT-blue.svg)](https://raw.githubusercontent.com/CircleCI-Public/circleci-demo-go/master/LICENSE.md)
-
+# VncProxy
 An RFB proxy, written in go that can save and replay FBS files
 * Supports all modern encodings & most useful pseudo-encodings
 * Supports multiple VNC client connections & multi servers (chosen by sessionId)
 * Supports being a "websockify" proxy (for web clients like NoVnc)
-* Produces FBS files compatible with [tightvnc's rfb player](https://www.tightvnc.com/rfbplayer.php) (while using tight's default 3Byte color format)
+* Produces FBS files compatible with tightvnc player (while using tight's default 3Byte color format)
 * Can also be used as:
     * A screen recorder vnc-client
     * A replay server to show fbs recordings to connecting clients 
@@ -16,7 +15,6 @@ An RFB proxy, written in go that can save and replay FBS files
     - ChickenOfTheVnc(client)
     - VineVnc(server)
     - TigerVnc(client)
-    - Qemu vnc(server) 
 
 
 ### Executables (see releases)
@@ -25,7 +23,7 @@ An RFB proxy, written in go that can save and replay FBS files
 * player - a toy player that will replay a given fbs file to all incoming connections
 
 ## Usage:
-    recorder -recFile=./recording.rbs -targHost=192.168.0.100 -targPort=5903 -targPass=@@@@@
+    recorder -recDir=./recording.rbs -targHost=192.168.0.100 -targPort=5903 -targPass=@@@@@
     player -fbsFile=./myrec.fbs -tcpPort=5905
     proxy -recDir=./recordings/ -targHost=192.168.0.100 -targPort=5903 -targPass=@@@@@ -tcpPort=5903 -wsPort=5905 -vncPass=@!@!@!
 

build.sh

@@ -2,7 +2,7 @@
 sum="sha1sum"
 
 # VERSION=`date -u +%Y%m%d`
-VERSION="v1.11"
+VERSION="v1.02"
 LDFLAGS="-X main.VERSION=$VERSION -s -w"
 GCFLAGS=""
 

client/client-conn.go

@@ -4,11 +4,11 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
 	"io"
 	"net"
 	"unicode"
+	"vncproxy/common"
+	"vncproxy/logger"
 )
 
 // A ServerMessage implements a message sent from the server to the client.
@@ -146,7 +146,7 @@ func (c *ClientConn) CutText(text string) error {
 
 	for _, char := range text {
 		if char > unicode.MaxLatin1 {
-			return fmt.Errorf("Character '%v' is not valid Latin-1", char)
+			return fmt.Errorf("Character '%s' is not valid Latin-1", char)
 		}
 
 		if err := binary.Write(&buf, binary.BigEndian, uint8(char)); err != nil {
@@ -474,7 +474,6 @@ func (c *ClientConn) mainLoop() {
 		new(MsgSetColorMapEntries),
 		new(MsgBell),
 		new(MsgServerCutText),
-		new(MsgServerFence),
 	}
 
 	for _, msg := range defaultMessages {

client/pixel-format.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 func readPixelFormat(r io.Reader, result *common.PixelFormat) error {

client/server-messages.go

@@ -6,9 +6,9 @@ import (
 	"fmt"
 	"io"
 	"strings"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/encodings"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/common"
+	"vncproxy/encodings"
+	"vncproxy/logger"
 )
 
 // MsgFramebufferUpdate consists of a sequence of rectangles of
@@ -129,7 +129,7 @@ type MsgSetColorMapEntries struct {
 }
 
 func (fbm *MsgSetColorMapEntries) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
-	reader := common.NewRfbReadHelper(r)
+	reader := &common.RfbReadHelper{Reader: r}
 	writeTo := &WriteTo{w, "MsgSetColorMapEntries.CopyTo"}
 	reader.Listeners.AddListener(writeTo)
 	_, err := fbm.Read(c, reader)

client/write-to.go

@@ -2,8 +2,8 @@ package client
 
 import (
 	"io"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/common"
+	"vncproxy/logger"
 )
 
 type WriteTo struct {

common/rfb-reader-helper.go

@@ -5,7 +5,7 @@ import (
 	"encoding/binary"
 	"errors"
 	"io"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/logger"
 )
 
 var TightMinToCompress = 12

encodings/enc-copy-rect.go

@@ -3,7 +3,7 @@ package encodings
 import (
 	"encoding/binary"
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 type CopyRectEncoding struct {

encodings/enc-corre.go

@@ -3,7 +3,7 @@ package encodings
 import (
 	"encoding/binary"
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 type CoRREEncoding struct {

encodings/enc-cursor-pseudo.go

@@ -3,7 +3,7 @@ package encodings
 import (
 	"io"
 	"math"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 type EncCursorPseudo struct {

encodings/enc-hextile.go

@@ -2,8 +2,8 @@ package encodings
 
 import (
 	"io"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/common"
+	"vncproxy/logger"
 )
 
 const (

encodings/enc-led-state.go

@@ -2,8 +2,8 @@ package encodings
 
 import (
 	"io"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/common"
+	"vncproxy/logger"
 )
 
 type EncLedStatePseudo struct {

encodings/enc-pseudo.go

@@ -2,7 +2,7 @@ package encodings
 
 import (
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 type PseudoEncoding struct {

encodings/enc-raw.go

@@ -3,7 +3,7 @@ package encodings
 import (
 	"bytes"
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 // RawEncoding is raw pixel data sent by the server.

encodings/enc-rre.go

@@ -3,7 +3,7 @@ package encodings
 import (
 	"encoding/binary"
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 type RREEncoding struct {

encodings/enc-tight.go

@@ -4,8 +4,8 @@ import (
 	"bytes"
 	"errors"
 	"io"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/common"
+	"vncproxy/logger"
 )
 
 var TightMinToCompress int = 12

encodings/enc-tightpng.go

@@ -3,8 +3,8 @@ package encodings
 import (
 	"fmt"
 	"io"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/common"
+	"vncproxy/logger"
 )
 
 type TightPngEncoding struct {

encodings/enc-zlib.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 type ZLibEncoding struct {

encodings/enc-zrle.go

@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 type ZRLEEncoding struct {

go.mod

@@ -1,3 +0,0 @@
-module github.com/amitbet/vncproxy
-
-require golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76

go.sum

@@ -1,2 +0,0 @@
-golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76 h1:xx5MUFyRQRbPk6VjWjIE1epE/K5AoDD8QUN116NCy8k=
-golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

player/cmd/main.go

@@ -4,11 +4,11 @@ import (
 	"flag"
 	"fmt"
 	"os"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/encodings"
-	"github.com/amitbet/vncproxy/logger"
-	"github.com/amitbet/vncproxy/player"
-	"github.com/amitbet/vncproxy/server"
+	"vncproxy/common"
+	"vncproxy/encodings"
+	"vncproxy/logger"
+	"vncproxy/player"
+	"vncproxy/server"
 )
 
 func main() {

player/fbs-play-listener.go

@@ -5,10 +5,10 @@ import (
 
 	"io"
 	"time"
-	"github.com/amitbet/vncproxy/client"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
-	"github.com/amitbet/vncproxy/server"
+	"vncproxy/client"
+	"vncproxy/common"
+	"vncproxy/logger"
+	"vncproxy/server"
 )
 
 type VncStreamFileReader interface {

player/fbs-reader.go

@@ -5,9 +5,9 @@ import (
 	"encoding/binary"
 	"io"
 	"os"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/encodings"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/common"
+	"vncproxy/encodings"
+	"vncproxy/logger"
 )
 
 type FbsReader struct {

player/player_test.go

@@ -3,15 +3,14 @@ package player
 import (
 	"testing"
 	"time"
-
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/encodings"
-	"github.com/amitbet/vncproxy/logger"
-	"github.com/amitbet/vncproxy/server"
+	"vncproxy/common"
+	"vncproxy/encodings"
+	"vncproxy/logger"
+	"vncproxy/server"
 )
 
 func TestServer(t *testing.T) {
-	t.Skip("this isn't an automated test, just an entrypoint for debugging")
+
 	//chServer := make(chan common.ClientMessage)
 	//chClient := make(chan common.ServerMessage)
 

proxy/cmd/main.go

@@ -1,13 +1,9 @@
 package main
 
-import (
-	"flag"
-	"os"
-	"path/filepath"
-
-	"github.com/amitbet/vncproxy/logger"
-	vncproxy "github.com/amitbet/vncproxy/proxy"
-)
+import "vncproxy/proxy"
+import "flag"
+import "vncproxy/logger"
+import "os"
 
 func main() {
 	//create default session if required
@@ -15,9 +11,8 @@ func main() {
 	var wsPort = flag.String("wsPort", "", "websocket port")
 	var vncPass = flag.String("vncPass", "", "password on incoming vnc connections to the proxy, defaults to no password")
 	var recordDir = flag.String("recDir", "", "path to save FBS recordings WILL NOT RECORD if not defined.")
-	var targetVnc = flag.String("target", "", "target vnc server (host:port or /path/to/unix.socket)")
-	var targetVncPort = flag.String("targPort", "", "target vnc server port (deprecated, use -target)")
-	var targetVncHost = flag.String("targHost", "", "target vnc server host (deprecated, use -target)")
+	var targetVncPort = flag.String("targPort", "", "target vnc server port")
+	var targetVncHost = flag.String("targHost", "", "target vnc server host")
 	var targetVncPass = flag.String("targPass", "", "target vnc password")
 	var logLevel = flag.String("logLevel", "info", "change logging level")
 
@@ -30,8 +25,8 @@ func main() {
 		os.Exit(1)
 	}
 
-	if *targetVnc == "" && *targetVncPort == "" {
-		logger.Error("no target vnc server host/port or socket defined")
+	if *targetVncPort == "" {
+		logger.Error("no target vnc server port defined")
 		flag.Usage()
 		os.Exit(1)
 	}
@@ -39,42 +34,30 @@ func main() {
 	if *vncPass == "" {
 		logger.Warn("proxy will have no password")
 	}
+	if *recordDir == "" {
+		logger.Warn("FBS recording is turned off")
+	}
 
-	tcpURL := ""
+	tcpUrl := ""
 	if *tcpPort != "" {
-		tcpURL = ":" + string(*tcpPort)
+		tcpUrl = ":" + string(*tcpPort)
 	}
-	wsURL := ""
-	if *wsPort != "" {
-		wsURL = "http://0.0.0.0:" + string(*wsPort) + "/"
-	}
-	proxy := &vncproxy.VncProxy{
-		WsListeningURL:   wsURL, // empty = not listening on ws
-		TCPListeningURL:  tcpURL,
+
+	proxy := &proxy.VncProxy{
+		WsListeningUrl:   "http://0.0.0.0:" + string(*wsPort) + "/", // empty = not listening on ws
+		RecordingDir:     *recordDir,                                //"/Users/amitbet/vncRec",                     // empty = no recording
+		TcpListeningUrl:  tcpUrl,
 		ProxyVncPassword: *vncPass, //empty = no auth
-		SingleSession: &vncproxy.VncSession{
-			Target:         *targetVnc,
+		SingleSession: &proxy.VncSession{
 			TargetHostname: *targetVncHost,
 			TargetPort:     *targetVncPort,
 			TargetPassword: *targetVncPass, //"vncPass",
 			ID:             "dummySession",
-			Status:         vncproxy.SessionStatusInit,
-			Type:           vncproxy.SessionTypeProxyPass,
+			Status:         proxy.SessionStatusInit,
+			Type:           proxy.SessionTypeRecordingProxy,
 		}, // to be used when not using sessions
 		UsingSessions: false, //false = single session - defined in the var above
 	}
 
-	if *recordDir != "" {
-		fullPath, err := filepath.Abs(*recordDir)
-		if err != nil {
-			logger.Error("bad recording path: ", err)
-		}
-		logger.Info("FBS recording is turned on, writing to dir: ", fullPath)
-		proxy.RecordingDir = fullPath
-		proxy.SingleSession.Type = vncproxy.SessionTypeRecordingProxy
-	} else {
-		logger.Info("FBS recording is turned off")
-	}
-
 	proxy.StartListening()
 }

proxy/message-listeners.go

@@ -1,10 +1,10 @@
 package proxy
 
 import (
-	"github.com/amitbet/vncproxy/client"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
-	"github.com/amitbet/vncproxy/server"
+	"vncproxy/client"
+	"vncproxy/common"
+	"vncproxy/logger"
+	"vncproxy/server"
 )
 
 type ClientUpdater struct {

proxy/proxy.go

@@ -5,19 +5,18 @@ import (
 	"path"
 	"strconv"
 	"time"
-
-	"github.com/amitbet/vncproxy/client"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/encodings"
-	"github.com/amitbet/vncproxy/logger"
-	"github.com/amitbet/vncproxy/player"
-	listeners "github.com/amitbet/vncproxy/recorder"
-	"github.com/amitbet/vncproxy/server"
+	"vncproxy/client"
+	"vncproxy/common"
+	"vncproxy/encodings"
+	"vncproxy/logger"
+	"vncproxy/player"
+	listeners "vncproxy/recorder"
+	"vncproxy/server"
 )
 
 type VncProxy struct {
-	TCPListeningURL  string      // empty = not listening on tcp
-	WsListeningURL   string      // empty = not listening on ws
+	TcpListeningUrl  string      // empty = not listening on tcp
+	WsListeningUrl   string      // empty = not listening on ws
 	RecordingDir     string      // empty = no recording
 	ProxyVncPassword string      //empty = no auth
 	SingleSession    *VncSession // to be used when not using sessions
@@ -25,17 +24,8 @@ type VncProxy struct {
 	sessionManager   *SessionManager
 }
 
-func (vp *VncProxy) createClientConnection(target string, vncPass string) (*client.ClientConn, error) {
-	var (
-		nc  net.Conn
-		err error
-	)
-
-	if target[0] == '/' {
-		nc, err = net.Dial("unix", target)
-	} else {
-		nc, err = net.Dial("tcp", target)
-	}
+func (vp *VncProxy) createClientConnection(targetServerUrl string, vncPass string) (*client.ClientConn, error) {
+	nc, err := net.Dial("tcp", targetServerUrl)
 
 	if err != nil {
 		logger.Errorf("error connecting to vnc server: %s", err)
@@ -95,12 +85,7 @@ func (vp *VncProxy) newServerConnHandler(cfg *server.ServerConfig, sconn *server
 
 	session.Status = SessionStatusInit
 	if session.Type == SessionTypeProxyPass || session.Type == SessionTypeRecordingProxy {
-		target := session.Target
-		if session.TargetHostname != "" && session.TargetPort != "" {
-			target = session.TargetHostname + ":" + session.TargetPort
-		}
-
-		cconn, err := vp.createClientConnection(target, session.TargetPassword)
+		cconn, err := vp.createClientConnection(session.TargetHostname+":"+session.TargetPort, session.TargetPassword)
 		if err != nil {
 			session.Status = SessionStatusError
 			logger.Errorf("Proxy.newServerConnHandler error creating connection: %s", err)
@@ -186,19 +171,19 @@ func (vp *VncProxy) StartListening() {
 		UseDummySession:  !vp.UsingSessions,
 	}
 
-	if vp.TCPListeningURL != "" && vp.WsListeningURL != "" {
-		logger.Infof("running two listeners: tcp port: %s, ws url: %s", vp.TCPListeningURL, vp.WsListeningURL)
+	if vp.TcpListeningUrl != "" && vp.WsListeningUrl != "" {
+		logger.Infof("running two listeners: tcp port: %s, ws url: %s", vp.TcpListeningUrl, vp.WsListeningUrl)
 
-		go server.WsServe(vp.WsListeningURL, cfg)
-		server.TcpServe(vp.TCPListeningURL, cfg)
+		go server.WsServe(vp.WsListeningUrl, cfg)
+		server.TcpServe(vp.TcpListeningUrl, cfg)
 	}
 
-	if vp.WsListeningURL != "" {
-		logger.Infof("running ws listener url: %s", vp.WsListeningURL)
-		server.WsServe(vp.WsListeningURL, cfg)
+	if vp.WsListeningUrl != "" {
+		logger.Infof("running ws listener url: %s", vp.WsListeningUrl)
+		server.WsServe(vp.WsListeningUrl, cfg)
 	}
-	if vp.TCPListeningURL != "" {
-		logger.Infof("running tcp listener on port: %s", vp.TCPListeningURL)
-		server.TcpServe(vp.TCPListeningURL, cfg)
+	if vp.TcpListeningUrl != "" {
+		logger.Infof("running tcp listener on port: %s", vp.TcpListeningUrl)
+		server.TcpServe(":"+vp.TcpListeningUrl, cfg)
 	}
 }

proxy/proxy_test.go

@@ -4,12 +4,11 @@ import "testing"
 
 func TestProxy(t *testing.T) {
 	//create default session if required
-	t.Skip("this isn't an automated test, just an entrypoint for debugging")
 
 	proxy := &VncProxy{
-		WsListeningURL:  "http://0.0.0.0:7778/", // empty = not listening on ws
+		WsListeningUrl:  "http://0.0.0.0:7778/", // empty = not listening on ws
 		RecordingDir:    "d:\\",                 // empty = no recording
-		TCPListeningURL: ":5904",
+		TcpListeningUrl: ":5904",
 		//RecordingDir:          "C:\\vncRec", // empty = no recording
 		ProxyVncPassword: "1234", //empty = no auth
 		SingleSession: &VncSession{

proxy/vnc-session.go

@@ -16,7 +16,6 @@ const (
 )
 
 type VncSession struct {
-	Target         string
 	TargetHostname string
 	TargetPort     string
 	TargetPassword string

recorder/cmd/main.go

@@ -5,11 +5,11 @@ import (
 	"net"
 	"os"
 	"time"
-	"github.com/amitbet/vncproxy/client"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/encodings"
-	"github.com/amitbet/vncproxy/logger"
-	"github.com/amitbet/vncproxy/recorder"
+	"vncproxy/client"
+	"vncproxy/common"
+	"vncproxy/encodings"
+	"vncproxy/logger"
+	"vncproxy/recorder"
 )
 
 func main() {

recorder/recorder.go

@@ -5,9 +5,9 @@ import (
 	"encoding/binary"
 	"os"
 	"time"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
-	"github.com/amitbet/vncproxy/server"
+	"vncproxy/common"
+	"vncproxy/logger"
+	"vncproxy/server"
 )
 
 type Recorder struct {

recorder/rfb-requester.go

@@ -2,9 +2,9 @@ package recorder
 
 import (
 	"time"
-	"github.com/amitbet/vncproxy/client"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/client"
+	"vncproxy/common"
+	"vncproxy/logger"
 )
 
 type RfbRequester struct {

server/client-messages.go

@@ -3,7 +3,7 @@ package server
 import (
 	"encoding/binary"
 	"io"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 // Key represents a VNC key press.

server/handlers.go

@@ -3,10 +3,10 @@ package server
 import (
 	"encoding/binary"
 	"fmt"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 
 	"io"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/logger"
 )
 
 const ProtoVersionLength = 12

server/security.go

@@ -6,7 +6,7 @@ import (
 	"crypto/rand"
 	"errors"
 	"log"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 type SecurityType uint8

server/server-conn.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"io"
 	"sync"
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/common"
+	"vncproxy/logger"
 )
 
 type ServerConn struct {

server/server.go

@@ -5,7 +5,7 @@ import (
 	"io"
 	"log"
 	"net"
-	"github.com/amitbet/vncproxy/common"
+	"vncproxy/common"
 )
 
 var DefaultClientMessages = []common.ClientMessage{

server/server_test.go

@@ -3,9 +3,8 @@ package server
 import (
 	"log"
 	"testing"
-
-	"github.com/amitbet/vncproxy/common"
-	"github.com/amitbet/vncproxy/encodings"
+	"vncproxy/common"
+	"vncproxy/encodings"
 )
 
 func newServerConnHandler(cfg *ServerConfig, conn *ServerConn) error {
@@ -14,7 +13,6 @@ func newServerConnHandler(cfg *ServerConfig, conn *ServerConn) error {
 }
 
 func TestServer(t *testing.T) {
-	t.Skip("this isn't an automated test, just an entrypoint for debugging")
 
 	//chServer := make(chan common.ClientMessage)
 	chClient := make(chan common.ServerMessage)

server/ws-server-go.go

@@ -4,7 +4,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
-	"github.com/amitbet/vncproxy/logger"
+	"vncproxy/logger"
 
 	"golang.org/x/net/websocket"
 )