diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-28 21:52:09 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-28 21:52:09 +0800 |
| commit | b46e1ca97e61ebfe4c37961e723142245efe5016 (patch) | |
| tree | 45838760ad08592995cd1051c29c6d41d08cd24c /cmd/mist | |
| parent | 159c4d56cd82d6fe721058557977f4efda31661c (diff) | |
| parent | e9d017ba082bfd624267c974fa93a77da6269756 (diff) | |
| download | go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.tar go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.tar.gz go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.tar.bz2 go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.tar.lz go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.tar.xz go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.tar.zst go-tangerine-b46e1ca97e61ebfe4c37961e723142245efe5016.zip | |
Merge branch 'jsonrpc' of github.com-obscure:ethereum/go-ethereum into jsonrpc
Diffstat (limited to 'cmd/mist')
| -rw-r--r-- | cmd/mist/flags.go | 2 | ||||
| -rw-r--r-- | cmd/mist/main.go | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/cmd/mist/flags.go b/cmd/mist/flags.go index 8a67cdd0a..f530394c2 100644 --- a/cmd/mist/flags.go +++ b/cmd/mist/flags.go @@ -43,6 +43,7 @@ var ( StartRpc bool StartWebSockets bool RpcPort int + WsPort int UseUPnP bool NatType string OutboundPort string @@ -111,6 +112,7 @@ func Init() { flag.BoolVar(&UseUPnP, "upnp", true, "enable UPnP support") flag.IntVar(&MaxPeer, "maxpeer", 30, "maximum desired peers") flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on") + flag.IntVar(&WsPort, "wsport", 40404, "port to start websocket rpc server on") flag.BoolVar(&StartRpc, "rpc", false, "start rpc server") flag.BoolVar(&StartWebSockets, "ws", false, "start websocket server") flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)") diff --git a/cmd/mist/main.go b/cmd/mist/main.go index eb0a80add..bcfb7f2ec 100644 --- a/cmd/mist/main.go +++ b/cmd/mist/main.go @@ -73,7 +73,7 @@ func run() error { } if StartWebSockets { - utils.StartWebSockets(ethereum) + utils.StartWebSockets(ethereum, WsPort) } gui := NewWindow(ethereum, config, ethereum.ClientIdentity().(*p2p.SimpleClientIdentity), KeyRing, LogLevel) |