added Windows support for experimental IPC interface

This commit is contained in:
Bas van Kervel 2015-11-27 09:23:08 +01:00 committed by Péter Szilágyi
parent 3bff502d67
commit b29774c4f2
2 changed files with 16 additions and 14 deletions

View file

@ -791,8 +791,14 @@ func StartIPC(stack *node.Node, ctx *cli.Context) error {
if err := stack.Service(&shh); err != nil { if err := stack.Service(&shh); err != nil {
return err return err
} }
config := comms.IpcConfig{
Endpoint: IpcSocketPath(ctx),
}
if ctx.GlobalIsSet(IPCExperimental.Name) { if ctx.GlobalIsSet(IPCExperimental.Name) {
listener, err := comms.CreateListener(config)
if err != nil {
return err
}
server := rpc.NewServer() server := rpc.NewServer()
server.RegisterName("eth", accounts.NewAccountService(ethereum.AccountManager())) server.RegisterName("eth", accounts.NewAccountService(ethereum.AccountManager()))
@ -807,18 +813,13 @@ func StartIPC(stack *node.Node, ctx *cli.Context) error {
server.RegisterName("personal", accounts.NewPersonalService(ethereum.AccountManager())) server.RegisterName("personal", accounts.NewPersonalService(ethereum.AccountManager()))
server.RegisterName("shh", whisper.NewWhisperService(shh)) server.RegisterName("shh", whisper.NewWhisperService(shh))
ipcEndpoint := IpcSocketPath(ctx)
os.RemoveAll(ipcEndpoint)
l, err := net.ListenUnix("unix", &net.UnixAddr{Name: ipcEndpoint, Net: "unix"})
if err != nil {
return err
}
go func() { go func() {
glog.Infof("IPC endpoint(%s)\n", ipcEndpoint) glog.Infof("IPC Service endpoint(%s)\n", config.Endpoint)
for { for {
conn, err := l.Accept() conn, err := listener.Accept()
if err != nil { if err != nil {
panic(err) glog.Errorf("%v\n", err)
continue
} }
codec := rpc.NewJSONCodec(conn) codec := rpc.NewJSONCodec(conn)
go server.ServeCodec(codec) go server.ServeCodec(codec)
@ -828,10 +829,6 @@ func StartIPC(stack *node.Node, ctx *cli.Context) error {
return nil return nil
} }
config := comms.IpcConfig{
Endpoint: IpcSocketPath(ctx),
}
initializer := func(conn net.Conn) (comms.Stopper, shared.EthereumApi, error) { initializer := func(conn net.Conn) (comms.Stopper, shared.EthereumApi, error) {
fe := useragent.NewRemoteFrontend(conn, ethereum.AccountManager()) fe := useragent.NewRemoteFrontend(conn, ethereum.AccountManager())
xeth := xeth.New(stack, fe) xeth := xeth.New(stack, fe)

View file

@ -124,6 +124,11 @@ func StartIpc(cfg IpcConfig, codec codec.Codec, initializer InitFunc) error {
return nil return nil
} }
// CreateListener creates an listener, on Unix platforms this is a unix socket, on Windows this is a named pipe
func CreateListener(cfg IpcConfig) (net.Listener, error) {
return ipcListen(cfg)
}
func ipcLoop(cfg IpcConfig, codec codec.Codec, initializer InitFunc, l net.Listener) { func ipcLoop(cfg IpcConfig, codec codec.Codec, initializer InitFunc, l net.Listener) {
glog.V(logger.Info).Infof("IPC service started (%s)\n", cfg.Endpoint) glog.V(logger.Info).Infof("IPC service started (%s)\n", cfg.Endpoint)
defer os.Remove(cfg.Endpoint) defer os.Remove(cfg.Endpoint)