From 4a2c17b1ab8316ab3b4fa2b769d1dccad3cb97d5 Mon Sep 17 00:00:00 2001
From: Lewis Marshall <lewis@lmars.net>
Date: Sun, 21 May 2017 23:56:40 -0700
Subject: cmd/swarm: Add --httpaddr flag (#14475)

Fixes #14474.

Signed-off-by: Lewis Marshall <lewis@lmars.net>
---
 swarm/api/config.go      | 19 +++++++++++--------
 swarm/api/config_test.go |  1 +
 swarm/api/http/server.go |  1 -
 3 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'swarm/api')

diff --git a/swarm/api/config.go b/swarm/api/config.go
index 23a855500..647c153ed 100644
--- a/swarm/api/config.go
+++ b/swarm/api/config.go
@@ -32,7 +32,8 @@ import (
 )
 
 const (
-	port = "8500"
+	DefaultHTTPListenAddr = "127.0.0.1"
+	DefaultHTTPPort       = "8500"
 )
 
 var (
@@ -48,12 +49,13 @@ type Config struct {
 	*network.HiveParams
 	Swap *swap.SwapParams
 	*network.SyncParams
-	Path      string
-	Port      string
-	PublicKey string
-	BzzKey    string
-	EnsRoot   common.Address
-	NetworkId uint64
+	Path       string
+	ListenAddr string
+	Port       string
+	PublicKey  string
+	BzzKey     string
+	EnsRoot    common.Address
+	NetworkId  uint64
 }
 
 // config is agnostic to where private key is coming from
@@ -76,7 +78,8 @@ func NewConfig(path string, contract common.Address, prvKey *ecdsa.PrivateKey, n
 		HiveParams:    network.NewHiveParams(dirpath),
 		ChunkerParams: storage.NewChunkerParams(),
 		StoreParams:   storage.NewStoreParams(dirpath),
-		Port:          port,
+		ListenAddr:    DefaultHTTPListenAddr,
+		Port:          DefaultHTTPPort,
 		Path:          dirpath,
 		Swap:          swap.DefaultSwapParams(contract, prvKey),
 		PublicKey:     pubkeyhex,
diff --git a/swarm/api/config_test.go b/swarm/api/config_test.go
index 2f40098a3..6b5cea915 100644
--- a/swarm/api/config_test.go
+++ b/swarm/api/config_test.go
@@ -80,6 +80,7 @@ var (
         false
     ],
     "Path": "TMPDIR",
+    "ListenAddr": "127.0.0.1",
     "Port": "8500",
     "PublicKey": "0x045f5cfd26692e48d0017d380349bcf50982488bc11b5145f3ddf88b24924299048450542d43527fbe29a5cb32f38d62755393ac002e6bfdd71b8d7ba725ecd7a3",
     "BzzKey": "0xe861964402c0b78e2d44098329b8545726f215afa737d803714a4338552fcb81",
diff --git a/swarm/api/http/server.go b/swarm/api/http/server.go
index 849b9e10f..5f64f971b 100644
--- a/swarm/api/http/server.go
+++ b/swarm/api/http/server.go
@@ -69,7 +69,6 @@ func StartHttpServer(api *api.Api, config *ServerConfig) {
 	hdlr := c.Handler(NewServer(api))
 
 	go http.ListenAndServe(config.Addr, hdlr)
-	log.Info(fmt.Sprintf("Swarm HTTP proxy started on localhost:%s", config.Addr))
 }
 
 func NewServer(api *api.Api) *Server {
-- 
cgit