mirror of
https://github.com/amitbet/vncproxy.git
synced 2025-09-16 06:41:37 +00:00
some work on the replay subsystem, plus getting better grasp of the FBS format
This commit is contained in:
amit bezalel
161
player/fbs-reader.go
Normal file
161
player/fbs-reader.go
Normal file
@@ -0,0 +1,161 @@
|
||||
package player
|
||||
|
||||
import (
|
||||
"encoding/binary"
|
||||
"io"
|
||||
"os"
|
||||
"vncproxy/common"
|
||||
"vncproxy/logger"
|
||||
"bytes"
|
||||
)
|
||||
|
||||
type FbsReader struct {
|
||||
reader io.Reader
|
||||
buffer bytes.Buffer
|
||||
currentTimestamp uint32
|
||||
}
|
||||
|
||||
func (fbs *FbsReader) Read(p []byte) (n int, err error) {
|
||||
if fbs.buffer.Len() < len(p) {
|
||||
seg, err := fbs.ReadSegment()
|
||||
if err != nil {
|
||||
logger.Error("FBSReader.Read: error reading FBSsegment: ",err)
|
||||
return 0, err
|
||||
}
|
||||
fbs.buffer.Write(seg.bytes)
|
||||
fbs.currentTimestamp = seg.timestamp
|
||||
}
|
||||
return fbs.buffer.Read(p)
|
||||
}
|
||||
|
||||
func NewFbsReader(fbsFile string) (*FbsReader, error) {
|
||||
|
||||
reader, err := os.OpenFile(fbsFile, os.O_RDONLY, 0644)
|
||||
if err != nil {
|
||||
logger.Error("NewFbsReader: can't open fbs file: ", fbsFile)
|
||||
return nil, err
|
||||
}
|
||||
return &FbsReader{reader: reader}, nil
|
||||
}
|
||||
|
||||
func (fbs *FbsReader) ReadStartSession() (*common.ServerInit, error) {
|
||||
|
||||
initMsg := common.ServerInit{}
|
||||
reader := fbs.reader
|
||||
|
||||
var framebufferWidth uint16
|
||||
var framebufferHeight uint16
|
||||
var SecTypeNone uint32
|
||||
//read rfb header information (the only part done without the [size|data|timestamp] block wrapper)
|
||||
//.("FBS 001.000\n")
|
||||
bytes := make([]byte, 12)
|
||||
_, err := reader.Read(bytes)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs init message - FBS file Version:", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
//read the version message into the buffer so it will be written in the first rbs block
|
||||
//RFB 003.008\n
|
||||
bytes = make([]byte, 12)
|
||||
_, err = fbs.Read(bytes)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs init - RFB Version: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
//push sec type and fb dimensions
|
||||
binary.Read(fbs, binary.BigEndian, &SecTypeNone)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs init - SecType: ", err)
|
||||
}
|
||||
|
||||
//read frame buffer width, height
|
||||
binary.Read(fbs, binary.BigEndian, &framebufferWidth)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs init - FBWidth: ", err)
|
||||
return nil, err
|
||||
}
|
||||
initMsg.FBWidth = framebufferWidth
|
||||
|
||||
binary.Read(fbs, binary.BigEndian, &framebufferHeight)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs init - FBHeight: ", err)
|
||||
return nil, err
|
||||
}
|
||||
initMsg.FBHeight = framebufferHeight
|
||||
|
||||
//read pixel format
|
||||
pixelFormat := &common.PixelFormat{}
|
||||
binary.Read(fbs, binary.BigEndian, pixelFormat)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs init - Pixelformat: ", err)
|
||||
return nil, err
|
||||
}
|
||||
initMsg.PixelFormat = *pixelFormat
|
||||
//read padding
|
||||
bytes = make([]byte, 3)
|
||||
fbs.Read(bytes)
|
||||
|
||||
//read desktop name
|
||||
var desknameLen uint32
|
||||
binary.Read(fbs, binary.BigEndian, &desknameLen)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs init - deskname Len: ", err)
|
||||
return nil, err
|
||||
}
|
||||
initMsg.NameLength = desknameLen
|
||||
|
||||
bytes = make([]byte, desknameLen)
|
||||
fbs.Read(bytes)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs init - desktopName: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
initMsg.NameText = bytes
|
||||
|
||||
return &initMsg, nil
|
||||
}
|
||||
|
||||
func (fbs *FbsReader) ReadSegment() (*FbsSegment, error) {
|
||||
reader := fbs.reader
|
||||
var bytesLen uint32
|
||||
|
||||
//read length
|
||||
err := binary.Read(reader, binary.BigEndian, &bytesLen)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs file: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
paddedSize := (bytesLen + 3) & 0x7FFFFFFC
|
||||
|
||||
//read bytes
|
||||
bytes := make([]byte, paddedSize)
|
||||
_, err = reader.Read(bytes)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs file: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
//remove padding
|
||||
actualBytes := bytes[:bytesLen]
|
||||
|
||||
//read timestamp
|
||||
var timeSinceStart uint32
|
||||
binary.Read(reader, binary.BigEndian, &timeSinceStart)
|
||||
if err != nil {
|
||||
logger.Error("error reading rbs file: ", err)
|
||||
return nil, err
|
||||
}
|
||||
|
||||
//timeStamp := time.Unix(timeSinceStart, 0)
|
||||
seg := &FbsSegment{bytes: actualBytes, timestamp: timeSinceStart}
|
||||
return seg, nil
|
||||
}
|
||||
|
||||
type FbsSegment struct {
|
||||
bytes []byte
|
||||
timestamp uint32
|
||||
}
|
||||
137
player/player_test.go
Normal file
137
player/player_test.go
Normal file
@@ -0,0 +1,137 @@
|
||||
package player
|
||||
|
||||
import (
|
||||
"log"
|
||||
"testing"
|
||||
"time"
|
||||
"vncproxy/common"
|
||||
"vncproxy/encodings"
|
||||
"vncproxy/logger"
|
||||
"vncproxy/server"
|
||||
"encoding/binary"
|
||||
)
|
||||
|
||||
type ServerMessageHandler struct {
|
||||
Conn *server.ServerConn
|
||||
Fbs *FbsReader
|
||||
firstSegDone bool
|
||||
startTime int
|
||||
}
|
||||
|
||||
func (handler *ServerMessageHandler) Consume(seg *common.RfbSegment) error {
|
||||
|
||||
switch seg.SegmentType {
|
||||
case common.SegmentFullyParsedClientMessage:
|
||||
clientMsg := seg.Message.(common.ClientMessage)
|
||||
logger.Debugf("ClientUpdater.Consume:(vnc-server-bound) got ClientMessage type=%s", clientMsg.Type())
|
||||
switch clientMsg.Type() {
|
||||
|
||||
case common.FramebufferUpdateRequestMsgType:
|
||||
if !handler.firstSegDone {
|
||||
handler.firstSegDone = true
|
||||
handler.startTime = int(time.Now().UnixNano() / int64(time.Millisecond))
|
||||
}
|
||||
handler.sendFbsMessage()
|
||||
}
|
||||
// server.FramebufferUpdateRequest:
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (h *ServerMessageHandler) sendFbsMessage() {
|
||||
var messageType uint8
|
||||
fbs := h.Fbs
|
||||
//conn := h.Conn
|
||||
binary.Read(fbs,binary.BigEndian,&messageType)
|
||||
bytes := messages[messageType].Read(fbs)
|
||||
h.Conn.Write(bytes)
|
||||
|
||||
//seg, err := fbs.ReadSegment()
|
||||
//
|
||||
//now := int(time.Now().UnixNano() / int64(time.Millisecond))
|
||||
//if err != nil {
|
||||
// logger.Error("TestServer.NewConnHandler: Error in reading FBS segment: ", err)
|
||||
// return
|
||||
//}
|
||||
//timeSinceStart := now - h.startTime
|
||||
//
|
||||
//timeToWait := timeSinceStart - int(seg.timestamp)
|
||||
//
|
||||
//if timeToWait > 0 {
|
||||
// time.Sleep(time.Duration(timeToWait) * time.Millisecond)
|
||||
//}
|
||||
//fmt.Printf("bytes: %v", seg.bytes)
|
||||
//conn.Write(seg.bytes)
|
||||
}
|
||||
|
||||
func loadFbsFile(filename string, conn *server.ServerConn) (*FbsReader, error) {
|
||||
fbs, err := NewFbsReader(filename)
|
||||
if err != nil {
|
||||
logger.Error("failed to open fbs reader:", err)
|
||||
return nil, err
|
||||
}
|
||||
//NewFbsReader("/Users/amitbet/vncRec/recording.rbs")
|
||||
initMsg, err := fbs.ReadStartSession()
|
||||
if err != nil {
|
||||
logger.Error("failed to open read fbs start session:", err)
|
||||
return nil, err
|
||||
}
|
||||
conn.SetPixelFormat(&initMsg.PixelFormat)
|
||||
conn.SetHeight(initMsg.FBHeight)
|
||||
conn.SetWidth(initMsg.FBWidth)
|
||||
conn.SetDesktopName(string(initMsg.NameText))
|
||||
|
||||
return fbs, nil
|
||||
}
|
||||
|
||||
func TestServer(t *testing.T) {
|
||||
|
||||
//chServer := make(chan common.ClientMessage)
|
||||
chClient := make(chan common.ServerMessage)
|
||||
|
||||
cfg := &server.ServerConfig{
|
||||
//SecurityHandlers: []SecurityHandler{&ServerAuthNone{}, &ServerAuthVNC{}},
|
||||
SecurityHandlers: []server.SecurityHandler{&server.ServerAuthNone{}},
|
||||
Encodings: []common.Encoding{&encodings.RawEncoding{}, &encodings.TightEncoding{}, &encodings.CopyRectEncoding{}},
|
||||
PixelFormat: common.NewPixelFormat(32),
|
||||
//ClientMessageCh: chServer,
|
||||
//ServerMessageCh: chClient,
|
||||
ClientMessages: server.DefaultClientMessages,
|
||||
DesktopName: []byte("workDesk"),
|
||||
Height: uint16(768),
|
||||
Width: uint16(1024),
|
||||
//NewConnHandler: serverNewConnHandler,
|
||||
}
|
||||
|
||||
cfg.NewConnHandler = func(cfg *server.ServerConfig, conn *server.ServerConn) error {
|
||||
fbs, err := loadFbsFile("/Users/amitbet/Dropbox/recording.rbs", conn)
|
||||
if err != nil {
|
||||
logger.Error("TestServer.NewConnHandler: Error in loading FBS: ", err)
|
||||
return err
|
||||
}
|
||||
conn.Listeners.AddListener(&ServerMessageHandler{conn, fbs, false, 0})
|
||||
return nil
|
||||
}
|
||||
|
||||
url := "http://localhost:7777/"
|
||||
go server.WsServe(url, cfg)
|
||||
go server.TcpServe(":5904", cfg)
|
||||
|
||||
// fbs, err := loadFbsFile("/Users/amitbet/vncRec/recording.rbs", cfg)
|
||||
// if err != nil {
|
||||
// logger.Error("TestServer.NewConnHandler: Error in loading FBS: ", err)
|
||||
// return
|
||||
// }
|
||||
|
||||
// Process messages coming in on the ClientMessage channel.
|
||||
|
||||
for {
|
||||
msg := <-chClient
|
||||
switch msg.Type() {
|
||||
default:
|
||||
log.Printf("Received message type:%v msg:%v\n", msg.Type(), msg)
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user