github/vncproxy
1
0
Fork 0
mirror of https://github.com/amitbet/vncproxy.git synced 2025-08-17 05:06:45 +00:00
Code Issues Projects Releases Wiki Activity

fixed a mean buffers bug where readerHelper sent the empty part of the buffer to listeners.

Browse Source
This commit is contained in:
amit bezalel 2017-07-22 00:07:22 +03:00
parent 0d44ad3ca5
commit 1307fd6d3a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/rfb-reader-helper.go
View File

@ -115,10 +115,10 @@ func (r *RfbReadHelper) Read(p []byte) (n int, err error) {
// prevlen = len(p) // prevlen = len(p)
///////// /////////
logger.Debugf("RfbReadHelper.Read: publishing bytes, bytes:%v", p) logger.Debugf("RfbReadHelper.Read: publishing bytes, bytes:%v", p[:readLen])
//write the bytes to the Listener for further processing //write the bytes to the Listener for further processing
seg := &RfbSegment{Bytes: p, SegmentType: SegmentBytes} seg := &RfbSegment{Bytes: p[:readLen], SegmentType: SegmentBytes}
err = r.Listeners.Consume(seg) err = r.Listeners.Consume(seg)
if err != nil { if err != nil {
return 0, err return 0, err
@ -141,6 +141,7 @@ func (r *RfbReadHelper) ReadBytes(count int) ([]byte, error) {
//err := binary.Read(r, binary.BigEndian, &buff) //err := binary.Read(r, binary.BigEndian, &buff)
if err != nil { if err != nil {
logger.Errorf("RfbReadHelper.ReadBytes error while reading bytes: ", err)
//if err := binary.Read(d.conn, binary.BigEndian, &buff); err != nil { //if err := binary.Read(d.conn, binary.BigEndian, &buff); err != nil {
return nil, err return nil, err
} }

4
logger/logger.go
View File

@ -2,6 +2,8 @@ package logger
import "fmt" import "fmt"
var simpleLogger = SimpleLogger{LogLevelInfo}
type Logger interface { type Logger interface {
Debug(v ...interface{}) Debug(v ...interface{})
Debugf(format string, v ...interface{}) Debugf(format string, v ...interface{})
@ -101,8 +103,6 @@ func (sl *SimpleLogger) Fatalf(format string, v ...interface{}) {
} }
} }
var simpleLogger = SimpleLogger{LogLevelInfo}
func Debug(v ...interface{}) { func Debug(v ...interface{}) {
simpleLogger.Debug(v...) simpleLogger.Debug(v...)
} }