github/vncproxy
1
0
Fork 0
mirror of https://github.com/amitbet/vncproxy.git synced 2025-09-23 02:19:52 +00:00
Code Issues Projects Releases Wiki Activity

some more house cleaning, updated license & docs

Browse Source
This commit is contained in:
amit bezalel
2017-07-15 07:52:23 +03:00
parent fa61227d89
commit 01fd227088
14 changed files with 111 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
server/server-conn.go
View File

@@ -12,8 +12,7 @@ import (
type ServerConn struct {
c io.ReadWriter
cfg *ServerConfig
//br *bufio.Reader
//bw *bufio.Writer
protocol string
m sync.Mutex
// If the pixel format uses a color map, then this is the color
@@ -96,25 +95,10 @@ func (c *ServerConn) SetProtoVersion(pv string) {
c.protocol = pv
}
// func (c *ServerConn) Flush() error {
// // c.m.Lock()
// // defer c.m.Unlock()
// return c.bw.Flush()
// }
func (c *ServerConn) Close() error {
return c.c.(io.ReadWriteCloser).Close()
}
/*
func (c *ServerConn) Input() chan *ServerMessage {
return c.cfg.ServerMessageCh
}
func (c *ServerConn) Output() chan *ClientMessage {
return c.cfg.ClientMessageCh
}
*/
func (c *ServerConn) Read(buf []byte) (int, error) {
return c.c.Read(buf)
}
@@ -157,8 +141,6 @@ func (c *ServerConn) Height() uint16 {
func (c *ServerConn) Protocol() string {
return c.protocol
}
// TODO send desktopsize pseudo encoding
func (c *ServerConn) SetWidth(w uint16) {
c.fbWidth = w
}
@@ -167,42 +149,19 @@ func (c *ServerConn) SetHeight(h uint16) {
}
func (c *ServerConn) handle() error {
//var err error
//var wg sync.WaitGroup
//defer c.Close()
defer func() {
c.Listeners.Consume(&common.RfbSegment{
SegmentType: common.SegmentConnectionClosed,
})
}()
//create a map of all message types
clientMessages := make(map[common.ClientMessageType]common.ClientMessage)
for _, m := range c.cfg.ClientMessages {
clientMessages[m.Type()] = m
}
//wg.Add(2)
// server
// go func() error {
// //defer wg.Done()
// for {
// select {
// case msg := <-c.cfg.ServerMessageCh:
// logger.Debugf("%v", msg)
// // if err = msg.Write(c); err != nil {
// // return err
// // }
// case <-c.quit:
// c.Close()
// return nil
// }
// }
// }()
// client
//go func() error {
//defer wg.Done()
for {
select {
case <-c.quit:
@@ -238,9 +197,8 @@ func (c *ServerConn) handle() error {
return err
}
//logger.Debugf("ServerConn.Handle got client message, type=%s", parsedMsg.Type())
logger.Debugf("ServerConn.Handle got ClientMessage: %s, %v", parsedMsg.Type(), parsedMsg)
//parsedMsg.Type()
seg := &common.RfbSegment{
SegmentType: common.SegmentFullyParsedClientMessage,
Message: parsedMsg,
@@ -250,12 +208,6 @@ func (c *ServerConn) handle() error {
logger.Errorf("ServerConn.Handle: listener consume err %s", err.Error())
return err
}
//c.cfg.ClientMessageCh <- parsedMsg
}
}
//}()
//wg.Wait()
//return nil
}

54
server/server.go
View File

@@ -17,62 +17,32 @@ var DefaultClientMessages = []common.ClientMessage{
&ClientCutText{},
}
//var _ ServerConn = (*ServerConn)(nil)
// ServerMessage represents a Client-to-Server RFB message type.
// type ServerMessageType uint8
// //go:generate stringer -type=ServerMessageType
// // Client-to-Server message types.
// const (
// FramebufferUpdateMsgType ServerMessageType = iota
// SetColorMapEntriesMsgType
// BellMsgType
// ServerCutTextMsgType
// )
// FramebufferUpdate holds a FramebufferUpdate wire format message.
type FramebufferUpdate struct {
_ [1]byte // pad
_ [1]byte // padding
NumRect uint16 // number-of-rectangles
Rects []*common.Rectangle // rectangles
}
// func (*FramebufferUpdate) Type() ServerMessageType {
// return FramebufferUpdateMsgType
// }
type ServerHandler func(*ServerConfig, *ServerConn) error
type ServerConfig struct {
//VersionHandler ServerHandler
//SecurityHandler ServerHandler
SecurityHandlers []SecurityHandler
//ClientInitHandler ServerHandler
//ServerInitHandler ServerHandler
Encodings []common.Encoding
PixelFormat *common.PixelFormat
ColorMap *common.ColorMap
//ClientMessageCh chan common.ClientMessage
//ServerMessageCh chan common.ServerMessage
ClientMessages []common.ClientMessage
DesktopName []byte
Height uint16
Width uint16
UseDummySession bool
Encodings []common.Encoding
PixelFormat *common.PixelFormat
ColorMap *common.ColorMap
ClientMessages []common.ClientMessage
DesktopName []byte
Height uint16
Width uint16
UseDummySession bool
//handler to allow for registering for messages, this can't be a channel
//because of the websockets handler function which will kill the connection on exit if conn.handle() is run on another thread
NewConnHandler ServerHandler
}
func wsHandlerFunc(ws io.ReadWriter, cfg *ServerConfig, sessionId string) {
// header := ws.Request().Header
// url := ws.Request().URL
// //stam := header.Get("Origin")
// logger.Debugf("header: %v\nurl: %v", header, url)
// io.Copy(ws, ws)
err := attachNewServerConn(ws, cfg, sessionId)
if err != nil {
log.Fatalf("Error attaching new connection. %v", err)
@@ -80,7 +50,6 @@ func wsHandlerFunc(ws io.ReadWriter, cfg *ServerConfig, sessionId string) {
}
func WsServe(url string, cfg *ServerConfig) error {
//server := WsServer1{cfg}
server := WsServer{cfg}
server.Listen(url, WsHandler(wsHandlerFunc))
return nil
@@ -97,9 +66,6 @@ func TcpServe(url string, cfg *ServerConfig) error {
return err
}
go attachNewServerConn(c, cfg, "dummySession")
// if err != nil {
// return err
// }
}
return nil
}

2
server/server_test.go
View File

@@ -22,8 +22,6 @@ func TestServer(t *testing.T) {
SecurityHandlers: []SecurityHandler{&ServerAuthVNC{"Ch_#!T@8"}},
Encodings: []common.Encoding{&encodings.RawEncoding{}, &encodings.TightEncoding{}, &encodings.CopyRectEncoding{}},
PixelFormat: common.NewPixelFormat(32),
//ClientMessageCh: chServer,
ServerMessageCh: chClient,
ClientMessages: DefaultClientMessages,
DesktopName: []byte("workDesk"),
Height: uint16(768),

104
server/ws-server-gorilla.go
View File

@@ -1,104 +0,0 @@
package server
import (
"io"
"log"
"net/http"
"net/url"
"vncproxy/logger"
"bytes"
"github.com/gorilla/websocket"
)
type WsServer1 struct {
cfg *ServerConfig
}
type WsHandler1 func(io.ReadWriter, *ServerConfig)
var upgrader = websocket.Upgrader{
ReadBufferSize: 1024,
WriteBufferSize: 1024,
CheckOrigin: func(r *http.Request) bool {
return true
}}
type WsConnection struct {
Reader WsReader
Writer WsWriter
}
func NewWsConnection(c *websocket.Conn) *WsConnection {
return &WsConnection{
WsReader{},
WsWriter{c},
}
}
type WsWriter struct {
conn *websocket.Conn
}
type WsReader struct {
Buff bytes.Buffer
}
func (wr WsReader) Read(p []byte) (n int, err error) {
return wr.Buff.Read(p)
}
func (wr WsWriter) Write(p []byte) (int, error) {
err := wr.conn.WriteMessage(websocket.BinaryMessage, p)
return len(p), err
}
func handleConnection(w http.ResponseWriter, r *http.Request) {
log.Print("got connection:", r.URL)
c, err := upgrader.Upgrade(w, r, nil)
if err != nil {
log.Print("upgrade:", err)
return
}
defer c.Close()
myConn := NewWsConnection(c)
for {
mt, message, err := c.ReadMessage()
if err != nil {
log.Println("read:", err)
break
}
if mt == websocket.BinaryMessage {
myConn.Reader.Buff.Write(message)
}
log.Printf("recv: %s", message)
// err = c.WriteMessage(mt, message)
// if err != nil {
// log.Println("write:", err)
// break
// }
}
}
// This example demonstrates a trivial echo server.
func (wsServer *WsServer1) Listen(urlStr string, handlerFunc WsHandler) {
//http.Handle("/", websocket.Handler(EchoHandler))
if urlStr == "" {
urlStr = "/"
}
url, err := url.Parse(urlStr)
if err != nil {
logger.Errorf("error while parsing url: ", err)
}
http.HandleFunc(url.Path, handleConnection)
err = http.ListenAndServe(url.Host, nil)
if err != nil {
panic("ListenAndServe: " + err.Error())
}
}