Skip to content

user agent messages were dumped in some cases #1710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions rpc/comms/ipc.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,12 @@ func (self *ipcClient) Close() {
self.coder.Close()
}

func (self *ipcClient) Send(req interface{}) error {
func (self *ipcClient) Send(msg interface{}) error {
var err error
if r, ok := req.(*shared.Request); ok {
if err = self.coder.WriteResponse(r); err != nil {
if err = self.reconnect(); err == nil {
err = self.coder.WriteResponse(r)
}
if err = self.coder.WriteResponse(msg); err != nil {
if err = self.reconnect(); err == nil {
err = self.coder.WriteResponse(msg)
}

return err
}
return err
}
Expand Down
23 changes: 22 additions & 1 deletion rpc/comms/ipc_unix.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent"
)

func newIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) {
Expand All @@ -34,14 +35,34 @@ func newIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) {
return nil, err
}

return &ipcClient{cfg.Endpoint, c, codec, codec.New(c)}, nil
coder := codec.New(c)
msg := shared.Request{
Id: 0,
Method: useragent.EnableUserAgentMethod,
Jsonrpc: shared.JsonRpcVersion,
Params: []byte("[]"),
}

coder.WriteResponse(msg)
coder.Recv()

return &ipcClient{cfg.Endpoint, c, codec, coder}, nil
}

func (self *ipcClient) reconnect() error {
self.coder.Close()
c, err := net.DialUnix("unix", nil, &net.UnixAddr{self.endpoint, "unix"})
if err == nil {
self.coder = self.codec.New(c)

msg := shared.Request{
Id: 0,
Method: useragent.EnableUserAgentMethod,
Jsonrpc: shared.JsonRpcVersion,
Params: []byte("[]"),
}
self.coder.WriteResponse(msg)
self.coder.Recv()
}

return err
Expand Down
23 changes: 22 additions & 1 deletion rpc/comms/ipc_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent"
)

var (
Expand Down Expand Up @@ -656,13 +657,33 @@ func newIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) {
return nil, err
}

return &ipcClient{cfg.Endpoint, c, codec, codec.New(c)}, nil
coder := codec.New(c)
msg := shared.Request{
Id: 0,
Method: useragent.EnableUserAgentMethod,
Jsonrpc: shared.JsonRpcVersion,
Params: []byte("[]"),
}

coder.WriteResponse(msg)
coder.Recv()

return &ipcClient{cfg.Endpoint, c, codec, coder}, nil
}

func (self *ipcClient) reconnect() error {
c, err := Dial(self.endpoint)
if err == nil {
self.coder = self.codec.New(c)

req := shared.Request{
Id: 0,
Method: useragent.EnableUserAgentMethod,
Jsonrpc: shared.JsonRpcVersion,
Params: []byte("[]"),
}
self.coder.WriteResponse(req)
self.coder.Recv()
}
return err
}
Expand Down
10 changes: 0 additions & 10 deletions rpc/jeth.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,16 +40,6 @@ type Jeth struct {
}

func NewJeth(ethApi shared.EthereumApi, re *jsre.JSRE, client comms.EthereumClient, fe xeth.Frontend) *Jeth {
// enable the jeth as the user agent
req := shared.Request{
Id: 0,
Method: useragent.EnableUserAgentMethod,
Jsonrpc: shared.JsonRpcVersion,
Params: []byte("[]"),
}
client.Send(&req)
client.Recv()

return &Jeth{ethApi, re, client, fe}
}

Expand Down