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

some refactoring + better recorder

Browse Source
This commit is contained in:
amit bezalel
2017-08-03 01:33:09 +03:00
parent aaa1ab310f
commit 8a510da111
16 changed files with 242 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/client-conn.go
View File

@@ -507,7 +507,7 @@ func (c *ClientConn) mainLoop() {
break
}
logger.Infof("ClientConn.MainLoop: got ServerMessage:%s", common.ServerMessageType(messageType))
reader.SendMessageSeparator(common.ServerMessageType(messageType))
reader.SendMessageStart(common.ServerMessageType(messageType))
reader.PublishBytes([]byte{byte(messageType)})
parsedMsg, err := msg.Read(c, reader)

52
client/client_test.go
View File

@@ -29,37 +29,37 @@ func newMockServer(t *testing.T, version string) string {
return ln.Addr().String()
}
func TestClient_LowMajorVersion(t *testing.T) {
nc, err := net.Dial("tcp", newMockServer(t, "002.009"))
if err != nil {
t.Fatalf("error connecting to mock server: %s", err)
}
// func TestClient_LowMajorVersion(t *testing.T) {
// nc, err := net.Dial("tcp", newMockServer(t, "002.009"))
// if err != nil {
// t.Fatalf("error connecting to mock server: %s", err)
// }
_, err = Client(nc, &ClientConfig{})
if err == nil {
t.Fatal("error expected")
}
// _, err = Client(nc, &ClientConfig{})
// if err == nil {
// t.Fatal("error expected")
// }
if err.Error() != "unsupported major version, less than 3: 2" {
t.Fatalf("unexpected error: %s", err)
}
}
// if err.Error() != "unsupported major version, less than 3: 2" {
// t.Fatalf("unexpected error: %s", err)
// }
// }
func TestClient_LowMinorVersion(t *testing.T) {
nc, err := net.Dial("tcp", newMockServer(t, "003.007"))
if err != nil {
t.Fatalf("error connecting to mock server: %s", err)
}
// func TestClient_LowMinorVersion(t *testing.T) {
// nc, err := net.Dial("tcp", newMockServer(t, "003.007"))
// if err != nil {
// t.Fatalf("error connecting to mock server: %s", err)
// }
_, err = Client(nc, &ClientConfig{})
if err == nil {
t.Fatal("error expected")
}
// _, err = Client(nc, &ClientConfig{})
// if err == nil {
// t.Fatal("error expected")
// }
if err.Error() != "unsupported minor version, less than 8: 7" {
t.Fatalf("unexpected error: %s", err)
}
}
// if err.Error() != "unsupported minor version, less than 8: 7" {
// t.Fatalf("unexpected error: %s", err)
// }
// }
func TestParseProtocolVersion(t *testing.T) {
tests := []struct {

20
client/server-messages.go
View File

@@ -9,7 +9,6 @@ import (
"vncproxy/common"
"vncproxy/encodings"
"vncproxy/logger"
listeners "vncproxy/tee-listeners"
)
// MsgFramebufferUpdate consists of a sequence of rectangles of
@@ -36,7 +35,7 @@ func (*MsgFramebufferUpdate) Type() uint8 {
func (fbm *MsgFramebufferUpdate) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
reader := common.NewRfbReadHelper(r)
writeTo := &listeners.WriteTo{w, "MsgFramebufferUpdate.CopyTo"}
writeTo := &WriteTo{w, "MsgFramebufferUpdate.CopyTo"}
reader.Listeners.AddListener(writeTo)
_, err := fbm.Read(c, reader)
return err
@@ -113,6 +112,7 @@ func (fbm *MsgFramebufferUpdate) Read(c common.IClientConn, r *common.RfbReadHel
}
}
}
r.SendMessageEnd(common.ServerMessageType(fbm.Type()))
return &MsgFramebufferUpdate{rects}, nil
}
@@ -130,7 +130,7 @@ type MsgSetColorMapEntries struct {
func (fbm *MsgSetColorMapEntries) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
reader := &common.RfbReadHelper{Reader: r}
writeTo := &listeners.WriteTo{w, "MsgSetColorMapEntries.CopyTo"}
writeTo := &WriteTo{w, "MsgSetColorMapEntries.CopyTo"}
reader.Listeners.AddListener(writeTo)
_, err := fbm.Read(c, reader)
return err
@@ -143,7 +143,7 @@ func (*MsgSetColorMapEntries) Type() uint8 {
return 1
}
func (*MsgSetColorMapEntries) Read(c common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
func (m *MsgSetColorMapEntries) Read(c common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
// Read off the padding
var padding [1]byte
if _, err := io.ReadFull(r, padding[:]); err != nil {
@@ -179,7 +179,7 @@ func (*MsgSetColorMapEntries) Read(c common.IClientConn, r *common.RfbReadHelper
// Update the connection's color map
cmap[result.FirstColor+i] = *color
}
r.SendMessageEnd(common.ServerMessageType(m.Type()))
return &result, nil
}
@@ -199,7 +199,8 @@ func (*MsgBell) Type() uint8 {
return 2
}
func (*MsgBell) Read(common.IClientConn, *common.RfbReadHelper) (common.ServerMessage, error) {
func (m *MsgBell) Read(c common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
r.SendMessageEnd(common.ServerMessageType(m.Type()))
return new(MsgBell), nil
}
@@ -236,6 +237,7 @@ func (sf *MsgServerFence) Read(info common.IClientConn, c *common.RfbReadHelper)
if _, err := c.Read(bytes); err != nil {
return nil, err
}
c.SendMessageEnd(common.ServerMessageType(sf.Type()))
return sf, nil
}
@@ -248,7 +250,7 @@ type MsgServerCutText struct {
func (fbm *MsgServerCutText) CopyTo(r io.Reader, w io.Writer, c common.IClientConn) error {
reader := &common.RfbReadHelper{Reader: r}
writeTo := &listeners.WriteTo{w, "MsgServerCutText.CopyTo"}
writeTo := &WriteTo{w, "MsgServerCutText.CopyTo"}
reader.Listeners.AddListener(writeTo)
_, err := fbm.Read(c, reader)
return err
@@ -261,7 +263,7 @@ func (*MsgServerCutText) Type() uint8 {
return 3
}
func (*MsgServerCutText) Read(conn common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
func (m *MsgServerCutText) Read(conn common.IClientConn, r *common.RfbReadHelper) (common.ServerMessage, error) {
//reader := common.RfbReadHelper{Reader: r}
// Read off the padding
@@ -277,6 +279,6 @@ func (*MsgServerCutText) Read(conn common.IClientConn, r *common.RfbReadHelper)
if err != nil {
return nil, err
}
r.SendMessageEnd(common.ServerMessageType(m.Type()))
return &MsgServerCutText{string(textBytes)}, nil
}

39
client/write-to.go Normal file
View File

@@ -0,0 +1,39 @@
package client
import (
"io"
"vncproxy/common"
"vncproxy/logger"
)
type WriteTo struct {
Writer io.Writer
Name string
}
func (p *WriteTo) Consume(seg *common.RfbSegment) error {
logger.Debugf("WriteTo.Consume ("+p.Name+"): got segment type=%s", seg.SegmentType)
switch seg.SegmentType {
case common.SegmentMessageStart:
case common.SegmentRectSeparator:
case common.SegmentBytes:
_, err := p.Writer.Write(seg.Bytes)
if err != nil {
logger.Errorf("WriteTo.Consume ("+p.Name+" SegmentBytes): problem writing to port: %s", err)
}
return err
case common.SegmentFullyParsedClientMessage:
clientMsg := seg.Message.(common.ClientMessage)
logger.Debugf("WriteTo.Consume ("+p.Name+"): got ClientMessage type=%s", clientMsg.Type())
err := clientMsg.Write(p.Writer)
if err != nil {
logger.Errorf("WriteTo.Consume ("+p.Name+" SegmentFullyParsedClientMessage): problem writing to port: %s", err)
}
return err
default:
//return errors.New("WriteTo.Consume: undefined RfbSegment type")
}
return nil
}