Added a registry to Barak.

cmd/barak/main.go

@@ -19,6 +19,7 @@ import (
 	"github.com/tendermint/tendermint/binary"
 	. "github.com/tendermint/tendermint/cmd/barak/types"
 	. "github.com/tendermint/tendermint/common"
+	"github.com/tendermint/tendermint/p2p"
 	pcm "github.com/tendermint/tendermint/process"
 	"github.com/tendermint/tendermint/rpc"
 )
@@ -33,6 +34,7 @@ type Options struct {
 	Validators    []Validator
 	ListenAddress string
 	StartNonce    uint64
+	Registries    []string
 }
 
 // Global instance
@@ -43,6 +45,7 @@ var barak = struct {
 	processes  map[string]*pcm.Process
 	validators []Validator
 	rootDir    string
+	registries []string
 }{
 	mtx:        sync.Mutex{},
 	pid:        os.Getpid(),
@@ -50,6 +53,7 @@ var barak = struct {
 	processes:  make(map[string]*pcm.Process),
 	validators: nil,
 	rootDir:    "",
+	registries: nil,
 }
 
 func main() {
@@ -95,11 +99,27 @@ func main() {
 	fmt.Printf("Barak: %v\n", barak)
 
 	// Start rpc server.
+	listener := p2p.NewDefaultListener("tcp", options.ListenAddress, false)
 	mux := http.NewServeMux()
 	mux.HandleFunc("/download", ServeFile)
+	mux.HandleFunc("/register", Register)
 	// TODO: mux.HandleFunc("/upload", UploadFile)
 	rpc.RegisterRPCFuncs(mux, Routes)
-	rpc.StartHTTPServer(options.ListenAddress, mux)
+	rpc.StartHTTPServer(listener, mux)
+
+	// Register this barak with central listener
+	extAddress := listener.ExternalAddress().String()
+	for _, registry := range barak.registries {
+		go func(registry string) {
+			var response ResponseRegister
+			_, err = rpc.Call(registry, "register", Arr(extAddress), &response)
+			if err != nil {
+				fmt.Printf("Error registering to registry %v:\n  %v\n", registry, err)
+			} else {
+				fmt.Printf("Successfully registered with registry %v\n", registry)
+			}
+		}(registry)
+	}
 
 	TrapSignal(func() {
 		fmt.Println("Barak shutting down")
@@ -255,8 +275,23 @@ func ListProcesses() (*ResponseListProcesses, error) {
 	}, nil
 }
 
-func ServeFile(w http.ResponseWriter, req *http.Request) {
+// Another barak instance registering its external
+// address to a remote barak.
+func Register(w http.ResponseWriter, req *http.Request) {
+	registry, err := os.OpenFile(barak.rootDir+"/registry.log", os.O_RDWR|os.O_APPEND, 0x600)
+	if err != nil {
+		http.Error(w, "Could not open registry file. Please contact the administrator", 500)
+		return
+	}
+	// TODO: Also check the X-FORWARDED-FOR or whatever it's called.
+	registry.Write([]byte(Fmt("++ %v\n", req.RemoteAddr)))
+	registry.Close()
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(200)
+	w.Write([]byte("Noted!"))
+}
 
+func ServeFile(w http.ResponseWriter, req *http.Request) {
 	authCommandStr := req.FormValue("auth_command")
 	command, err := parseValidateCommandStr(authCommandStr)
 	if err != nil {

cmd/barak/types/responses.go

@@ -10,6 +10,9 @@ type ResponseStatus struct {
 	Validators []Validator
 }
 
+type ResponseRegister struct {
+}
+
 type ResponseRunProcess struct {
 	Success bool
 	Output  string

node/node.go

@@ -162,10 +162,11 @@ func (n *Node) StartRPC() {
 	core.SetSwitch(n.sw)
 
 	listenAddr := config.App().GetString("RPC.HTTP.ListenAddr")
+	listener := p2p.NewDefaultListener("tcp", listenAddr, false)
 	mux := http.NewServeMux()
 	rpc.RegisterEventsHandler(mux, n.evsw)
 	rpc.RegisterRPCFuncs(mux, core.Routes)
-	rpc.StartHTTPServer(listenAddr, mux)
+	rpc.StartHTTPServer(listener, mux)
 }
 
 func (n *Node) Switch() *p2p.Switch {

p2p/listener.go

@@ -12,6 +12,7 @@ import (
 
 type Listener interface {
 	Connections() <-chan net.Conn
+	InternalAddress() *NetAddress
 	ExternalAddress() *NetAddress
 	String() string
 	Stop()
@@ -20,6 +21,7 @@ type Listener interface {
 // Implements Listener
 type DefaultListener struct {
 	listener    net.Listener
+	intAddr     *NetAddress
 	extAddr     *NetAddress
 	connections chan net.Conn
 	stopped     uint32
@@ -55,9 +57,11 @@ func NewDefaultListener(protocol string, lAddr string, requireUPNPHairpin bool)
 	listenerIP, listenerPort := splitHostPort(listener.Addr().String())
 	log.Debug("Local listener", "ip", listenerIP, "port", listenerPort)
 
+	// Determine internal address...
+	var intAddr *NetAddress = NewNetAddressString(lAddr)
+
 	// Determine external address...
 	var extAddr *NetAddress
-
 	// If the lAddrIP is INADDR_ANY, try UPnP
 	if lAddrIP == "" || lAddrIP == "0.0.0.0" {
 		if requireUPNPHairpin {
@@ -84,6 +88,7 @@ SKIP_UPNP:
 
 	dl := &DefaultListener{
 		listener:    listener,
+		intAddr:     intAddr,
 		extAddr:     extAddr,
 		connections: make(chan net.Conn, numBufferedConnections),
 	}
@@ -124,6 +129,10 @@ func (l *DefaultListener) Connections() <-chan net.Conn {
 	return l.connections
 }
 
+func (l *DefaultListener) InternalAddress() *NetAddress {
+	return l.intAddr
+}
+
 func (l *DefaultListener) ExternalAddress() *NetAddress {
 	return l.extAddr
 }

rpc/client.go

@@ -31,7 +31,6 @@ func Call(remote string, method string, params []interface{}, dest interface{})
 	if err != nil {
 		return dest, err
 	}
-
 	log.Debug(Fmt("RPC response: %v", string(responseBytes)))
 
 	// Parse response into JSONResponse

rpc/http_server.go

@@ -16,10 +16,11 @@ import (
 	"github.com/tendermint/tendermint/p2p"
 )
 
-func StartHTTPServer(listenAddr string, handler http.Handler) {
+func StartHTTPServer(listener p2p.Listener, handler http.Handler) {
-	log.Info(Fmt("Starting RPC HTTP server on %s", listenAddr))
+	log.Info(Fmt("Starting RPC HTTP server on ext:%v int:%v",
+		listener.ExternalAddress(),
+		listener.InternalAddress()))
 	go func() {
-		listener := p2p.NewDefaultListener("tcp", listenAddr, false)
 		netListener := listener.(*p2p.DefaultListener).NetListener()
 		res := http.Serve(
 			netListener,