fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-15 14:21:22 +00:00
Code Issues Projects Releases Wiki Activity

Prefix TMSP messages with length

Browse Source
This commit is contained in:
Jae Kwon
2015-12-20 08:18:39 -08:00
parent 0316dfc6f2
commit f288e58c81
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
consensus/common_test.go
View File

@ -16,7 +16,7 @@ import (
sm "github.com/tendermint/tendermint/state" sm "github.com/tendermint/tendermint/state"
"github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/types"
"github.com/tendermint/tmsp/example" "github.com/tendermint/tmsp/example/golang"
) )
var chainID string var chainID string

2
mempool/mempool_test.go
View File

@ -6,7 +6,7 @@ import (
"github.com/tendermint/tendermint/proxy" "github.com/tendermint/tendermint/proxy"
"github.com/tendermint/tendermint/types" "github.com/tendermint/tendermint/types"
"github.com/tendermint/tmsp/example" "github.com/tendermint/tmsp/example/golang"
tmsp "github.com/tendermint/tmsp/types" tmsp "github.com/tendermint/tmsp/types"
) )

2
node/node_test.go
View File

@ -7,7 +7,7 @@ import (
. "github.com/tendermint/go-common" . "github.com/tendermint/go-common"
"github.com/tendermint/go-p2p" "github.com/tendermint/go-p2p"
_ "github.com/tendermint/tendermint/config/tendermint_test" _ "github.com/tendermint/tendermint/config/tendermint_test"
"github.com/tendermint/tmsp/example" "github.com/tendermint/tmsp/example/golang"
"github.com/tendermint/tmsp/server" "github.com/tendermint/tmsp/server"
) )

14
proxy/remote_app_context.go
View File

@ -2,6 +2,7 @@ package proxy
import ( import (
"bufio" "bufio"
"bytes"
"container/list" "container/list"
"errors" "errors"
"fmt" "fmt"
@ -83,7 +84,7 @@ func (app *remoteAppContext) Error() error {
func (app *remoteAppContext) sendRequestsRoutine() { func (app *remoteAppContext) sendRequestsRoutine() {
for { for {
var n int var n, n2 int
var err error var err error
select { select {
case <-app.QuitService.Quit: case <-app.QuitService.Quit:
@ -92,7 +93,10 @@ func (app *remoteAppContext) sendRequestsRoutine() {
app.willSendReq(reqres) app.willSendReq(reqres)
wire.WriteBinary(reqres.Request, app.bufWriter, &n, &err) buf := new(bytes.Buffer)
wire.WriteBinary(reqres.Request, buf, &n2, &err) // Length prefix
wire.WriteVarint(buf.Len(), app.bufWriter, &n, &err)
wire.WriteTo(buf.Bytes(), app.bufWriter, &n, &err)
if err != nil { if err != nil {
app.StopForError(err) app.StopForError(err)
return return
@ -113,13 +117,17 @@ func (app *remoteAppContext) recvResponseRoutine() {
r := bufio.NewReader(app.conn) // Buffer reads r := bufio.NewReader(app.conn) // Buffer reads
for { for {
var res tmsp.Response var res tmsp.Response
var n int var n, n2 int
var err error var err error
size := wire.ReadVarint(r, &n2, &err)
wire.ReadBinaryPtr(&res, r, maxResponseSize, &n, &err) wire.ReadBinaryPtr(&res, r, maxResponseSize, &n, &err)
if err != nil { if err != nil {
app.StopForError(err) app.StopForError(err)
return return
} }
if size != n {
app.StopForError(fmt.Errorf("Prefixed length not equal to actual length. %v vs %v", size, n))
}
switch res := res.(type) { switch res := res.(type) {
case tmsp.ResponseException: case tmsp.ResponseException:
app.StopForError(errors.New(res.Error)) app.StopForError(errors.New(res.Error))

2
proxy/remote_app_context_test.go
View File

@ -7,7 +7,7 @@ import (
. "github.com/tendermint/go-common" . "github.com/tendermint/go-common"
"github.com/tendermint/go-logio" "github.com/tendermint/go-logio"
example "github.com/tendermint/tmsp/example" "github.com/tendermint/tmsp/example/golang"
"github.com/tendermint/tmsp/server" "github.com/tendermint/tmsp/server"
) )