From 510d3e9eba2367d927390e8fe6b8ba28bbcdd941 Mon Sep 17 00:00:00 2001 From: Gopal Ojha Date: Thu, 30 Nov 2017 11:08:24 +0545 Subject: [PATCH] returned to orginal position --- cmd/geth/chaincmd.go | 2 ++ p2p/server.go | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmd/geth/chaincmd.go b/cmd/geth/chaincmd.go index 4a9a7b11b..8996a1231 100644 --- a/cmd/geth/chaincmd.go +++ b/cmd/geth/chaincmd.go @@ -105,6 +105,8 @@ if already existing.`, utils.FakePoWFlag, utils.TestnetFlag, utils.RinkebyFlag, + // utils.RoseFlag, + }, Category: "BLOCKCHAIN COMMANDS", Description: ` diff --git a/p2p/server.go b/p2p/server.go index e020e5178..962cd0ce6 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -140,8 +140,8 @@ type Config struct { //for permission blockchain we need to add few fields. -EnableNodePermission bool `toml:",omitempty"` -DataDir string `toml:",omitempty"` +// EnableNodePermission bool `toml:",omitempty"` +// DataDir string `toml:",omitempty"` } @@ -723,8 +723,8 @@ func (srv *Server) SetupConn(fd net.Conn, flags connFlag, dialDest *discover.Nod -//starting RoseBay Premissioning - +//starting Rose Premissioning +/* currentNode :=srv.NodeInfo().ID cnodeName :=srv.NodeInfo().Name @@ -732,7 +732,7 @@ cnodeName :=srv.NodeInfo().Name -log.Trace("RoseBay Permissioning", +log.Trace("Rose Permissioning", "EnableNodePermission", srv.EnableNodePermission, "DataDir", srv.DataDir, "Current Node ID", currentNode, @@ -758,10 +758,10 @@ log.Trace("RoseBay Permissioning", log.Trace("Node Permissioning is Disabled.") } - //END of RoseBay Permissioning - + //END of Rose Permissioning +*/ clog := log.New("id", c.id, "addr", c.fd.RemoteAddr(), "conn", c.flags) // For dialed connections, check that the remote public key matches. if dialDest != nil && c.id != dialDest.ID {