Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

Conflicts:
	ethereal/ethereum.go
	ethereum/ethereum.go

2 files changed, 3 insertions, 1 deletions

diff --git a/ethereum/config.go b/ethereum/config.go
index 234e79f12..7ca1a9801 100644
--- a/ethereum/config.go
+++ b/ethereum/config.go
@@ -7,6 +7,7 @@ import (
 var StartConsole bool
 var StartMining bool
 var StartRpc bool
+var RpcPort int
 var UseUPnP bool
 var OutboundPort string
 var ShowGenesis bool
@@ -26,6 +27,7 @@ func Init() {
 	flag.BoolVar(&ShowGenesis, "g", false, "prints genesis header and exits")
 	//flag.BoolVar(&UseGui, "gui", true, "use the gui")
 	flag.BoolVar(&StartRpc, "r", false, "start rpc server")
+	flag.IntVar(&RpcPort, "rpcport", 8080, "port to start json-rpc server on")
 	flag.BoolVar(&NonInteractive, "y", false, "non-interactive mode (say yes to confirmations)")
 	flag.BoolVar(&UseUPnP, "upnp", false, "enable UPnP support")
 	flag.BoolVar(&UseSeed, "seed", true, "seed peers")
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go
index b60eb4181..5b578deba 100644
--- a/ethereum/ethereum.go
+++ b/ethereum/ethereum.go
@@ -133,7 +133,7 @@ func main() {
 		go console.Start()
 	}
 	if StartRpc {
-		ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum))
+		ethereum.RpcServer, err = ethrpc.NewJsonRpcServer(ethpub.NewPEthereum(ethereum), RpcPort)
 		if err != nil {
 			logger.Infoln("Could not start RPC interface:", err)
 		} else {