Preliminary debug state

This commit is contained in:
9seconds
2018-07-06 17:29:24 +03:00
parent 88faeb7195
commit a3933e6ede
21 changed files with 127 additions and 57 deletions
+12 -4
View File
@@ -31,15 +31,18 @@ func (a *AbridgedReadWriteCloserWithAddr) Read(p []byte) (int, error) {
buf := &bytes.Buffer{}
buf.Grow(3)
q := make([]byte, 1)
if _, err := io.CopyN(buf, a.conn, 1); err != nil {
return errors.Annotate(err, "Cannot read message length")
}
msgLength := uint8(buf.Bytes()[0])
q[0] = msgLength
buf.Reset()
if msgLength >= abridgedQuickAckLength {
a.opts.ReadHacks.QuickAck = true
msgLength -= 0x80
msgLength -= abridgedQuickAckLength
}
msgLength32 := uint32(msgLength)
@@ -49,6 +52,7 @@ func (a *AbridgedReadWriteCloserWithAddr) Read(p []byte) (int, error) {
}
number := uint24{}
copy(number[:], buf.Bytes())
q = append(q, buf.Bytes()...)
msgLength32 = fromUint24(number)
}
msgLength32 *= 4
@@ -59,6 +63,7 @@ func (a *AbridgedReadWriteCloserWithAddr) Read(p []byte) (int, error) {
if _, err := io.CopyN(buf, a.conn, int64(msgLength32)); err != nil {
return errors.Annotate(err, "Cannot read message")
}
q = append(q, buf.Bytes()...)
a.Buffer.Write(buf.Bytes())
return nil
@@ -87,10 +92,9 @@ func (a *AbridgedReadWriteCloserWithAddr) Write(p []byte) (int, error) {
buf.Write(length24[:])
buf.Write(p)
return a.conn.Write(buf.Bytes())
default:
return 0, errors.Errorf("Packet is too big %d", len(p))
}
return 0, errors.Errorf("Packet is too big %d", len(p))
}
func (a *AbridgedReadWriteCloserWithAddr) Close() error {
@@ -105,6 +109,10 @@ func (a *AbridgedReadWriteCloserWithAddr) RemoteAddr() *net.TCPAddr {
return a.conn.RemoteAddr()
}
func (a *AbridgedReadWriteCloserWithAddr) SocketID() string {
return a.conn.SocketID()
}
func toUint24(number uint32) uint24 {
return uint24{byte(number), byte(number >> 8), byte(number >> 16)}
}