github/vncproxy
1
0
Fork 0
mirror of https://github.com/amitbet/vncproxy.git synced 2025-09-08 16:39:09 +00:00
Code Issues Projects Releases Wiki Activity

Added server for web sockets, plus some refactoring

Browse Source
This commit is contained in:
amit bezalel
2017-07-01 23:01:58 +03:00
parent 66c322c164
commit 076d8bb4cf
28 changed files with 1774 additions and 1716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
server/server-conn.go
View File

@@ -1,17 +1,16 @@
package server
import (
"bufio"
"net"
"io"
"sync"
"vncproxy/common"
)
type ServerConn struct {
c net.Conn
cfg *ServerConfig
br *bufio.Reader
bw *bufio.Writer
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
@@ -41,11 +40,11 @@ type ServerConn struct {
quit chan struct{}
}
func (c *ServerConn) UnreadByte() error {
return c.br.UnreadByte()
}
// func (c *ServerConn) UnreadByte() error {
// return c.br.UnreadByte()
// }
func (c *ServerConn) Conn() net.Conn {
func (c *ServerConn) Conn() io.ReadWriter {
return c.c
}
@@ -66,14 +65,14 @@ 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) Flush() error {
// // c.m.Lock()
// // defer c.m.Unlock()
// return c.bw.Flush()
// }
func (c *ServerConn) Close() error {
return c.c.Close()
return c.c.(io.ReadWriteCloser).Close()
}
/*
@@ -86,13 +85,13 @@ func (c *ServerConn) Output() chan *ClientMessage {
}
*/
func (c *ServerConn) Read(buf []byte) (int, error) {
return c.br.Read(buf)
return c.c.Read(buf)
}
func (c *ServerConn) Write(buf []byte) (int, error) {
// c.m.Lock()
// defer c.m.Unlock()
return c.bw.Write(buf)
return c.c.Write(buf)
}
func (c *ServerConn) ColorMap() *common.ColorMap {