Added NodeInfo (still need to add to AddrBook); Proper Handshake

rpc/core/net.go

@@ -42,7 +42,7 @@ func NetInfo() (*ctypes.ResponseNetInfo, error) {
 	peers := []ctypes.Peer{}
 	for _, peer := range p2pSwitch.Peers().List() {
 		peers = append(peers, ctypes.Peer{
-			Address:    peer.Connection().RemoteAddress.String(),
+			NodeInfo:   *peer.NodeInfo,
 			IsOutbound: peer.IsOutbound(),
 		})
 	}

rpc/core/types/responses.go

@@ -78,7 +78,7 @@ type ResponseNetInfo struct {
 }
 
 type Peer struct {
-	Address    string
+	types.NodeInfo
 	IsOutbound bool
 }
 

rpc/http_server.go

@@ -13,13 +13,16 @@ import (
 	"github.com/tendermint/tendermint/alert"
 	"github.com/tendermint/tendermint/binary"
 	. "github.com/tendermint/tendermint/common"
+	"github.com/tendermint/tendermint/p2p"
 )
 
 func StartHTTPServer(listenAddr string, handler http.Handler) {
 	log.Info(Fmt("Starting RPC HTTP server on %s", listenAddr))
 	go func() {
-		res := http.ListenAndServe(
-			listenAddr,
+		listener := p2p.NewDefaultListener("tcp", listenAddr, false)
+		netListener := listener.(*p2p.DefaultListener).NetListener()
+		res := http.Serve(
+			netListener,
 			RecoverAndLogHandler(handler),
 		)
 		log.Crit("RPC HTTPServer stopped", "result", res)