diff --git a/client/client-conn.go b/client/client-conn.go index 645face..fb131d8 100644 --- a/client/client-conn.go +++ b/client/client-conn.go @@ -7,8 +7,8 @@ import ( "io" "net" "unicode" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/logger" ) // A ServerMessage implements a message sent from the server to the client. diff --git a/client/pixel-format.go b/client/pixel-format.go index 94d61dc..39fc02b 100644 --- a/client/pixel-format.go +++ b/client/pixel-format.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/binary" "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) func readPixelFormat(r io.Reader, result *common.PixelFormat) error { diff --git a/client/server-messages.go b/client/server-messages.go index 42a1106..2746a13 100644 --- a/client/server-messages.go +++ b/client/server-messages.go @@ -6,9 +6,9 @@ import ( "fmt" "io" "strings" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/encodings" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/encodings" + "vncproxy/logger" ) // MsgFramebufferUpdate consists of a sequence of rectangles of diff --git a/client/write-to.go b/client/write-to.go index dfc341c..5e6af65 100644 --- a/client/write-to.go +++ b/client/write-to.go @@ -2,8 +2,8 @@ package client import ( "io" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/logger" ) type WriteTo struct { diff --git a/common/rfb-reader-helper.go b/common/rfb-reader-helper.go index 105cd8b..75dfcc0 100644 --- a/common/rfb-reader-helper.go +++ b/common/rfb-reader-helper.go @@ -5,7 +5,7 @@ import ( "encoding/binary" "errors" "io" - "github.com/exoscale/vncproxy/logger" + "vncproxy/logger" ) var TightMinToCompress = 12 diff --git a/encodings/enc-copy-rect.go b/encodings/enc-copy-rect.go index 38cfa4b..8a6e6bf 100644 --- a/encodings/enc-copy-rect.go +++ b/encodings/enc-copy-rect.go @@ -3,7 +3,7 @@ package encodings import ( "encoding/binary" "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) type CopyRectEncoding struct { diff --git a/encodings/enc-corre.go b/encodings/enc-corre.go index 99a52be..5ab5831 100644 --- a/encodings/enc-corre.go +++ b/encodings/enc-corre.go @@ -3,7 +3,7 @@ package encodings import ( "encoding/binary" "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) type CoRREEncoding struct { diff --git a/encodings/enc-cursor-pseudo.go b/encodings/enc-cursor-pseudo.go index f26b657..74bed99 100644 --- a/encodings/enc-cursor-pseudo.go +++ b/encodings/enc-cursor-pseudo.go @@ -3,7 +3,7 @@ package encodings import ( "io" "math" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) type EncCursorPseudo struct { diff --git a/encodings/enc-hextile.go b/encodings/enc-hextile.go index 0de6865..3f56a21 100644 --- a/encodings/enc-hextile.go +++ b/encodings/enc-hextile.go @@ -2,8 +2,8 @@ package encodings import ( "io" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/logger" ) const ( diff --git a/encodings/enc-led-state.go b/encodings/enc-led-state.go index 51dbb36..a0966e1 100644 --- a/encodings/enc-led-state.go +++ b/encodings/enc-led-state.go @@ -2,8 +2,8 @@ package encodings import ( "io" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/logger" ) type EncLedStatePseudo struct { diff --git a/encodings/enc-pseudo.go b/encodings/enc-pseudo.go index c6958f3..128ccc9 100644 --- a/encodings/enc-pseudo.go +++ b/encodings/enc-pseudo.go @@ -2,7 +2,7 @@ package encodings import ( "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) type PseudoEncoding struct { diff --git a/encodings/enc-raw.go b/encodings/enc-raw.go index 37e0fe9..41fc8e7 100644 --- a/encodings/enc-raw.go +++ b/encodings/enc-raw.go @@ -3,7 +3,7 @@ package encodings import ( "bytes" "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) // RawEncoding is raw pixel data sent by the server. diff --git a/encodings/enc-rre.go b/encodings/enc-rre.go index e60ffea..e1f3c86 100644 --- a/encodings/enc-rre.go +++ b/encodings/enc-rre.go @@ -3,7 +3,7 @@ package encodings import ( "encoding/binary" "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) type RREEncoding struct { diff --git a/encodings/enc-tight.go b/encodings/enc-tight.go index 5955336..c1cb881 100644 --- a/encodings/enc-tight.go +++ b/encodings/enc-tight.go @@ -4,8 +4,8 @@ import ( "bytes" "errors" "io" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/logger" ) var TightMinToCompress int = 12 diff --git a/encodings/enc-tightpng.go b/encodings/enc-tightpng.go index b35c639..68639fa 100644 --- a/encodings/enc-tightpng.go +++ b/encodings/enc-tightpng.go @@ -3,8 +3,8 @@ package encodings import ( "fmt" "io" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/logger" ) type TightPngEncoding struct { diff --git a/encodings/enc-zlib.go b/encodings/enc-zlib.go index 2ddaa60..be27029 100644 --- a/encodings/enc-zlib.go +++ b/encodings/enc-zlib.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/binary" "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) type ZLibEncoding struct { diff --git a/encodings/enc-zrle.go b/encodings/enc-zrle.go index 01411fa..5f2eeb4 100644 --- a/encodings/enc-zrle.go +++ b/encodings/enc-zrle.go @@ -4,7 +4,7 @@ import ( "bytes" "encoding/binary" "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) type ZRLEEncoding struct { diff --git a/go.mod b/go.mod index 0c938e2..09bf117 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,10 @@ -module github.com/exoscale/vncproxy +module vncproxy require ( + github.com/go-stack/stack v1.8.0 // indirect github.com/mattn/go-colorable v0.0.9 // indirect github.com/mattn/go-isatty v0.0.4 // indirect - golang.org/x/net v0.0.0-20181114220301-adae6a3d119a - gopkg.in/inconshreveable/log15.v2 v2.0.0-20150921213854-b105bd37f74e + golang.org/x/net v0.0.0-20181129055619-fae4c4e3ad76 + golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 // indirect + gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec ) diff --git a/go.sum b/go.sum index 57a9c98..d0ff4ae 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,14 @@ +github.com/exoscale/log15 v2.11.0+incompatible h1:234j5Eyq6V6TVE25cgp6SS2lWB4Vp6/lYklQ4XaQhYc= +github.com/exoscale/log15 v2.11.0+incompatible/go.mod h1:VWUakuVl/g/fjJW0vIf9rP2hvD5C+fdIEznZz1QoeEs= +github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/mattn/go-colorable v0.0.9 h1:UVL0vNpWh04HeJXV0KLcaT7r06gOH2l4OW6ddYRUIY4= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-isatty v0.0.4 h1:bnP0vzxcAdeI1zdubAl5PjU6zsERjGZb7raWodagDYs= github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a h1:gOpx8G595UYyvj8UK4+OFyY4rx037g3fmfhe5SasG3U= -golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -gopkg.in/inconshreveable/log15.v2 v2.0.0-20150921213854-b105bd37f74e h1:L91+qpxBn9WAZLaC9mfKZ1bOZaWfxM/6LtH9nL6FJ/Q= -gopkg.in/inconshreveable/log15.v2 v2.0.0-20150921213854-b105bd37f74e/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= +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= +golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35 h1:YAFjXN64LMvktoUZH9zgY4lGc/msGN7HQfoSuKCgaDU= +golang.org/x/sys v0.0.0-20181128092732-4ed8d59d0b35/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec h1:RlWgLqCMMIYYEVcAR5MDsuHlVkaIPDAF+5Dehzg8L5A= +gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= diff --git a/player/cmd/main.go b/player/cmd/main.go index ce273e6..01f297c 100644 --- a/player/cmd/main.go +++ b/player/cmd/main.go @@ -4,11 +4,11 @@ import ( "flag" "fmt" "os" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/encodings" - "github.com/exoscale/vncproxy/logger" - "github.com/exoscale/vncproxy/player" - "github.com/exoscale/vncproxy/server" + "vncproxy/common" + "vncproxy/encodings" + "vncproxy/logger" + "vncproxy/player" + "vncproxy/server" ) func main() { diff --git a/player/fbs-play-listener.go b/player/fbs-play-listener.go index 29f45a4..f4458aa 100644 --- a/player/fbs-play-listener.go +++ b/player/fbs-play-listener.go @@ -5,10 +5,10 @@ import ( "io" "time" - "github.com/exoscale/vncproxy/client" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" - "github.com/exoscale/vncproxy/server" + "vncproxy/client" + "vncproxy/common" + "vncproxy/logger" + "vncproxy/server" ) type VncStreamFileReader interface { diff --git a/player/fbs-reader.go b/player/fbs-reader.go index 5656f4c..d6c6b7c 100644 --- a/player/fbs-reader.go +++ b/player/fbs-reader.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "io" "os" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/encodings" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/encodings" + "vncproxy/logger" ) type FbsReader struct { diff --git a/player/player_test.go b/player/player_test.go index 30863e4..ec76b28 100644 --- a/player/player_test.go +++ b/player/player_test.go @@ -3,10 +3,10 @@ package player import ( "testing" "time" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/encodings" - "github.com/exoscale/vncproxy/logger" - "github.com/exoscale/vncproxy/server" + "vncproxy/common" + "vncproxy/encodings" + "vncproxy/logger" + "vncproxy/server" ) func TestServer(t *testing.T) { diff --git a/proxy/cmd/main.go b/proxy/cmd/main.go index 855c1be..fb743cb 100644 --- a/proxy/cmd/main.go +++ b/proxy/cmd/main.go @@ -4,8 +4,8 @@ import ( "flag" "os" - "github.com/exoscale/vncproxy/logger" - vncproxy "github.com/exoscale/vncproxy/proxy" + "vncproxy/logger" + vncproxy "vncproxy/proxy" ) func main() { diff --git a/proxy/message-listeners.go b/proxy/message-listeners.go index 56a301d..6a013be 100644 --- a/proxy/message-listeners.go +++ b/proxy/message-listeners.go @@ -1,10 +1,10 @@ package proxy import ( - "github.com/exoscale/vncproxy/client" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" - "github.com/exoscale/vncproxy/server" + "vncproxy/client" + "vncproxy/common" + "vncproxy/logger" + "vncproxy/server" ) type ClientUpdater struct { diff --git a/proxy/proxy.go b/proxy/proxy.go index 2b0ba77..5d85ef4 100644 --- a/proxy/proxy.go +++ b/proxy/proxy.go @@ -5,13 +5,13 @@ import ( "path" "strconv" "time" - "github.com/exoscale/vncproxy/client" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/encodings" - "github.com/exoscale/vncproxy/logger" - "github.com/exoscale/vncproxy/player" - listeners "github.com/exoscale/vncproxy/recorder" - "github.com/exoscale/vncproxy/server" + "vncproxy/client" + "vncproxy/common" + "vncproxy/encodings" + "vncproxy/logger" + "vncproxy/player" + listeners "vncproxy/recorder" + "vncproxy/server" ) type VncProxy struct { diff --git a/recorder/cmd/main.go b/recorder/cmd/main.go index 1634071..7d90342 100644 --- a/recorder/cmd/main.go +++ b/recorder/cmd/main.go @@ -5,11 +5,11 @@ import ( "net" "os" "time" - "github.com/exoscale/vncproxy/client" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/encodings" - "github.com/exoscale/vncproxy/logger" - "github.com/exoscale/vncproxy/recorder" + "vncproxy/client" + "vncproxy/common" + "vncproxy/encodings" + "vncproxy/logger" + "vncproxy/recorder" ) func main() { diff --git a/recorder/recorder.go b/recorder/recorder.go index e4f6137..28dfd0e 100644 --- a/recorder/recorder.go +++ b/recorder/recorder.go @@ -5,9 +5,9 @@ import ( "encoding/binary" "os" "time" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" - "github.com/exoscale/vncproxy/server" + "vncproxy/common" + "vncproxy/logger" + "vncproxy/server" ) type Recorder struct { diff --git a/recorder/rfb-requester.go b/recorder/rfb-requester.go index 998ed2a..b72806c 100644 --- a/recorder/rfb-requester.go +++ b/recorder/rfb-requester.go @@ -2,9 +2,9 @@ package recorder import ( "time" - "github.com/exoscale/vncproxy/client" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" + "vncproxy/client" + "vncproxy/common" + "vncproxy/logger" ) type RfbRequester struct { diff --git a/server/client-messages.go b/server/client-messages.go index c1b1af8..5a1e64c 100644 --- a/server/client-messages.go +++ b/server/client-messages.go @@ -3,7 +3,7 @@ package server import ( "encoding/binary" "io" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) // Key represents a VNC key press. diff --git a/server/handlers.go b/server/handlers.go index 36c792b..70b58dd 100644 --- a/server/handlers.go +++ b/server/handlers.go @@ -3,10 +3,10 @@ package server import ( "encoding/binary" "fmt" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" "io" - "github.com/exoscale/vncproxy/logger" + "vncproxy/logger" ) const ProtoVersionLength = 12 diff --git a/server/security.go b/server/security.go index e4ef8fd..e122834 100644 --- a/server/security.go +++ b/server/security.go @@ -6,7 +6,7 @@ import ( "crypto/rand" "errors" "log" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) type SecurityType uint8 diff --git a/server/server-conn.go b/server/server-conn.go index 5d7843b..cb39dac 100644 --- a/server/server-conn.go +++ b/server/server-conn.go @@ -5,8 +5,8 @@ import ( "fmt" "io" "sync" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/logger" + "vncproxy/common" + "vncproxy/logger" ) type ServerConn struct { diff --git a/server/server.go b/server/server.go index 67b88fe..889b28f 100644 --- a/server/server.go +++ b/server/server.go @@ -5,7 +5,7 @@ import ( "io" "log" "net" - "github.com/exoscale/vncproxy/common" + "vncproxy/common" ) var DefaultClientMessages = []common.ClientMessage{ diff --git a/server/server_test.go b/server/server_test.go index c4615db..1938959 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -3,8 +3,8 @@ package server import ( "log" "testing" - "github.com/exoscale/vncproxy/common" - "github.com/exoscale/vncproxy/encodings" + "vncproxy/common" + "vncproxy/encodings" ) func newServerConnHandler(cfg *ServerConfig, conn *ServerConn) error { diff --git a/server/ws-server-go.go b/server/ws-server-go.go index 89abdec..1cfedb8 100644 --- a/server/ws-server-go.go +++ b/server/ws-server-go.go @@ -4,7 +4,7 @@ import ( "io" "net/http" "net/url" - "github.com/exoscale/vncproxy/logger" + "vncproxy/logger" "golang.org/x/net/websocket" )