tornadocontrib/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set ipc channel as user agent client

Browse Source
This commit is contained in:
Bas van Kervel 2015-08-24 12:22:12 +02:00
parent d51d0022ce
commit d910148a96
4 changed files with 48 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rpc/comms/ipc.go
View File

@ -42,16 +42,12 @@ func (self *ipcClient) Close() {
self.coder.Close() self.coder.Close()
} }
func (self *ipcClient) Send(req interface{}) error { func (self *ipcClient) Send(msg interface{}) error {
var err error var err error
if r, ok := req.(*shared.Request); ok { if err = self.coder.WriteResponse(msg); err != nil {
if err = self.coder.WriteResponse(r); err != nil { if err = self.reconnect(); err == nil {
if err = self.reconnect(); err == nil { err = self.coder.WriteResponse(msg)
err = self.coder.WriteResponse(r)
}
} }
return err
} }
return err return err
} }

23
rpc/comms/ipc_unix.go
View File

@ -26,6 +26,7 @@ import (
"github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/codec" "github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared" "github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent"
) )
func newIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) { func newIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) {
@ -34,7 +35,18 @@ func newIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) {
return nil, err 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 { func (self *ipcClient) reconnect() error {
@ -42,6 +54,15 @@ func (self *ipcClient) reconnect() error {
c, err := net.DialUnix("unix", nil, &net.UnixAddr{self.endpoint, "unix"}) c, err := net.DialUnix("unix", nil, &net.UnixAddr{self.endpoint, "unix"})
if err == nil { if err == nil {
self.coder = self.codec.New(c) 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 return err

23
rpc/comms/ipc_windows.go
View File

@ -32,6 +32,7 @@ import (
"github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/logger/glog"
"github.com/ethereum/go-ethereum/rpc/codec" "github.com/ethereum/go-ethereum/rpc/codec"
"github.com/ethereum/go-ethereum/rpc/shared" "github.com/ethereum/go-ethereum/rpc/shared"
"github.com/ethereum/go-ethereum/rpc/useragent"
) )
var ( var (
@ -656,13 +657,33 @@ func newIpcClient(cfg IpcConfig, codec codec.Codec) (*ipcClient, error) {
return nil, err 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 { func (self *ipcClient) reconnect() error {
c, err := Dial(self.endpoint) c, err := Dial(self.endpoint)
if err == nil { if err == nil {
self.coder = self.codec.New(c) 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 return err
} }

10
rpc/jeth.go
View File

@ -40,16 +40,6 @@ type Jeth struct {
} }
func NewJeth(ethApi shared.EthereumApi, re *jsre.JSRE, client comms.EthereumClient, fe xeth.Frontend) *Jeth { 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} return &Jeth{ethApi, re, client, fe}
} }