diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-01 18:51:39 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-01 18:51:39 +0800 |
| commit | b0e09ec82752b48c2384c315dc420e5c39e785b6 (patch) | |
| tree | 0dc20ee3807e3fe5a076fbfe2ec00bd6601792a6 /cmd/geth | |
| parent | 6afc5e762af0f81b70256ebb7e830b09caf17be0 (diff) | |
| parent | 720d978e356bba74160dbdd95b51bcb8087fb92e (diff) | |
| download | dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.gz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.bz2 dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.lz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.xz dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.tar.zst dexon-b0e09ec82752b48c2384c315dc420e5c39e785b6.zip | |
merge conflict
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/admin.go | 16 | ||||
| -rw-r--r-- | cmd/geth/main.go | 1 |
2 files changed, 12 insertions, 5 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 3a58b8881..b217e88b5 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -2,8 +2,6 @@ package main import ( "fmt" - "net" - "net/http" "os" "time" @@ -70,12 +68,20 @@ func (js *jsre) startRPC(call otto.FunctionCall) otto.Value { return otto.FalseValue() } - l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", addr, port)) + config := rpc.RpcConfig{ + ListenAddress: addr, + ListenPort: uint(port), + // CorsDomain: ctx.GlobalString(RPCCORSDomainFlag.Name), + } + + xeth := xeth.New(js.ethereum, nil) + err = rpc.Start(xeth, config) + if err != nil { - fmt.Printf("Can't listen on %s:%d: %v", addr, port, err) + fmt.Printf(err.Error()) return otto.FalseValue() } - go http.Serve(l, rpc.JSONRPC(xeth.New(js.ethereum, nil))) + return otto.TrueValue() } diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 05e2e4ae6..62e30ac9a 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -233,6 +233,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.VMDebugFlag, utils.ProtocolVersionFlag, utils.NetworkIdFlag, + utils.RPCCORSDomainFlag, } // missing: |