Merge pull request #2514 from bas-vk/startRPC_WS

karalabe · karalabe · commit 57ba1824ac2f · 2016-05-08T17:37:35.000+03:00
node: start RPC/WS interface on localhost by default
diff --git a/node/api.go b/node/api.go
@@ -68,7 +68,11 @@ func (api *PrivateAdminAPI) StartRPC(host *string, port *rpc.HexNumber, cors *st
 	}
 
 	if host == nil {
-		host = &api.node.httpHost
+		h := common.DefaultHTTPHost
+		if api.node.httpHost != "" {
+			h = api.node.httpHost
+		}
+		host = &h
 	}
 	if port == nil {
 		port = rpc.NewHexNumber(api.node.httpPort)
@@ -113,7 +117,11 @@ func (api *PrivateAdminAPI) StartWS(host *string, port *rpc.HexNumber, allowedOr
 	}
 
 	if host == nil {
-		host = &api.node.wsHost
+		h := common.DefaultWSHost
+		if api.node.wsHost != "" {
+			h = api.node.wsHost
+		}
+		host = &h
 	}
 	if port == nil {
 		port = rpc.NewHexNumber(api.node.wsPort)

Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,11 @@ func (api PrivateAdminAPI) StartRPC(host string, port rpc.HexNumber, cors st`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`if host == nil {`
`71`		`- host = &api.node.httpHost`
	`71`	`+ h := common.DefaultHTTPHost`
	`72`	`+ if api.node.httpHost != "" {`
	`73`	`+ h = api.node.httpHost`
	`74`	`+ }`
	`75`	`+ host = &h`
`72`	`76`	`}`
`73`	`77`	`if port == nil {`
`74`	`78`	`port = rpc.NewHexNumber(api.node.httpPort)`
`@@ -113,7 +117,11 @@ func (api PrivateAdminAPI) StartWS(host string, port *rpc.HexNumber, allowedOr`
`113`	`117`	`}`
`114`	`118`
`115`	`119`	`if host == nil {`
`116`		`- host = &api.node.wsHost`
	`120`	`+ h := common.DefaultWSHost`
	`121`	`+ if api.node.wsHost != "" {`
	`122`	`+ h = api.node.wsHost`
	`123`	`+ }`
	`124`	`+ host = &h`
`117`	`125`	`}`
`118`	`126`	`if port == nil {`
`119`	`127`	`port = rpc.NewHexNumber(api.node.wsPort)`