Merge branch 'release/v0.7.10'vv0.7.10

1 files changed, 67 insertions, 0 deletions

diff --git a/rpc/server.go b/rpc/server.go
new file mode 100644
index 000000000..983dc6c33
--- /dev/null
+++ b/rpc/server.go
@@ -0,0 +1,67 @@
+package rpc
+
+import (
+	"fmt"
+	"net"
+	"net/rpc"
+	"net/rpc/jsonrpc"
+
+	"github.com/ethereum/go-ethereum/logger"
+	"github.com/ethereum/go-ethereum/xeth"
+)
+
+var jsonlogger = logger.NewLogger("JSON")
+
+type JsonRpcServer struct {
+	quit     chan bool
+	listener net.Listener
+	pipe     *xeth.JSXEth
+}
+
+func (s *JsonRpcServer) exitHandler() {
+out:
+	for {
+		select {
+		case <-s.quit:
+			s.listener.Close()
+			break out
+		}
+	}
+
+	jsonlogger.Infoln("Shutdown JSON-RPC server")
+}
+
+func (s *JsonRpcServer) Stop() {
+	close(s.quit)
+}
+
+func (s *JsonRpcServer) Start() {
+	jsonlogger.Infoln("Starting JSON-RPC server")
+	go s.exitHandler()
+	rpc.Register(&EthereumApi{pipe: s.pipe})
+	rpc.HandleHTTP()
+
+	for {
+		conn, err := s.listener.Accept()
+		if err != nil {
+			jsonlogger.Infoln("Error starting JSON-RPC:", err)
+			break
+		}
+		jsonlogger.Debugln("Incoming request.")
+		go jsonrpc.ServeConn(conn)
+	}
+}
+
+func NewJsonRpcServer(pipe *xeth.JSXEth, port int) (*JsonRpcServer, error) {
+	sport := fmt.Sprintf(":%d", port)
+	l, err := net.Listen("tcp", sport)
+	if err != nil {
+		return nil, err
+	}
+
+	return &JsonRpcServer{
+		listener: l,
+		quit:     make(chan bool),
+		pipe:     pipe,
+	}, nil
+}