Add peer from api server

Author: agustim

cli/up.go

@@ -154,15 +154,15 @@ func UpRun(r *cmd.Root, c *cmd.Sub) {
 
 	// Setup P2P Discovery
 	go p2p.Discover(ctx, host, dht, peerTable)
-	go prettyDiscovery(ctx, host, peerTable)
+	go p2p.PrettyDiscovery(ctx, host, peerTable)
 
 	// Configure path for lock
 	lockPath := filepath.Join(filepath.Dir(cfg.Path), cfg.Interface.Name+".lock")
 
 	// Start webserver
 	fmt.Println("[+] Starting Web Server")
 
-	go webserver.CreateServer(cfg)
+	go webserver.CreateServer(ctx, host, dht, cfg, peerTable)
 
 	// Register the application to listen for SIGINT/SIGTERM
 	go signalExit(host, lockPath)
@@ -237,6 +237,7 @@ func UpRun(r *cmd.Root, c *cmd.Sub) {
 		// Check if the destination of the packet is a known peer to
 		// the interface.
 		if peer, ok := peerTable[dst]; ok {
+			fmt.Println("[+] New Packet from", peer.String())
 			stream, err = host.NewStream(ctx, peer, p2p.Protocol)
 			if err != nil {
 				continue
@@ -383,31 +384,6 @@ func streamHandler(stream network.Stream) {
 	}
 }
 
-func prettyDiscovery(ctx context.Context, node host.Host, peerTable map[string]peer.ID) {
-	// Build a temporary map of peers to limit querying to only those
-	// not connected.
-	tempTable := make(map[string]peer.ID, len(peerTable))
-	for ip, id := range peerTable {
-		tempTable[ip] = id
-	}
-	for len(tempTable) > 0 {
-		for ip, id := range tempTable {
-			stream, err := node.NewStream(ctx, id, p2p.Protocol)
-			if err != nil && (strings.HasPrefix(err.Error(), "failed to dial") ||
-				strings.HasPrefix(err.Error(), "no addresses")) {
-				// Attempt to connect to peers slowly when they aren't found.
-				time.Sleep(5 * time.Second)
-				continue
-			}
-			if err == nil {
-				fmt.Printf("[+] Connection to %s Successful. Network Ready.\n", ip)
-				stream.Close()
-			}
-			delete(tempTable, ip)
-		}
-	}
-}
-
 func verifyPort(port int) (int, error) {
 	var ln net.Listener
 	var err error

p2p/discover.go

@@ -2,6 +2,8 @@ package p2p
 
 import (
 	"context"
+	"fmt"
+	"strings"
 	"time"
 
 	"github.com/libp2p/go-libp2p-core/host"
@@ -35,3 +37,28 @@ func Discover(ctx context.Context, h host.Host, dht *dht.IpfsDHT, peerTable map[
 		}
 	}
 }
+
+func PrettyDiscovery(ctx context.Context, node host.Host, peerTable map[string]peer.ID) {
+	// Build a temporary map of peers to limit querying to only those
+	// not connected.
+	tempTable := make(map[string]peer.ID, len(peerTable))
+	for ip, id := range peerTable {
+		tempTable[ip] = id
+	}
+	for len(tempTable) > 0 {
+		for ip, id := range tempTable {
+			stream, err := node.NewStream(ctx, id, Protocol)
+			if err != nil && (strings.HasPrefix(err.Error(), "failed to dial") ||
+				strings.HasPrefix(err.Error(), "no addresses")) {
+				// Attempt to connect to peers slowly when they aren't found.
+				time.Sleep(5 * time.Second)
+				continue
+			}
+			if err == nil {
+				fmt.Printf("[+] Connection to %s Successful. Network Ready.\n", ip)
+				stream.Close()
+			}
+			delete(tempTable, ip)
+		}
+	}
+}

webserver/webserver.go

@@ -1,24 +1,33 @@
 package webserver
 
 import (
+	"context"
 	"encoding/json"
 	"log"
 
 	"net/http"
 
 	"github.com/hyprspace/hyprspace/config"
+	"github.com/hyprspace/hyprspace/p2p"
 	"github.com/julienschmidt/httprouter"
+	"github.com/libp2p/go-libp2p-core/host"
+	"github.com/libp2p/go-libp2p-core/peer"
+	dht "github.com/libp2p/go-libp2p-kad-dht"
 )
 
 type Server struct {
-	router *httprouter.Router
-	cfg    *config.Config
+	router    *httprouter.Router
+	ctx       context.Context
+	host      host.Host
+	dht       *dht.IpfsDHT
+	cfg       *config.Config
+	peerTable map[string]peer.ID
 }
 
 // Create a http server to read and edit the config file
-func CreateServer(cfg *config.Config) {
+func CreateServer(ctx context.Context, host host.Host, dht *dht.IpfsDHT, cfg *config.Config, peersTable map[string]peer.ID) {
 	// Create a new web server
-	server := &Server{cfg: cfg}
+	server := &Server{ctx: ctx, host: host, dht: dht, cfg: cfg, peerTable: peersTable}
 	server.Init()
 	server.Run()
 }
@@ -30,6 +39,7 @@ func (s *Server) Init() {
 	s.router.GET("/routes", s.Routes)
 	s.router.GET("/add-route/:net/:mask/:gateway", s.AddRoute)
 	s.router.GET("/remove-route/:net/:mask/:gateway", s.RemoveRoute)
+	s.router.GET("/add-peer/:ip/:peerid", s.AddPeer)
 }
 
 func (s *Server) Run() {
@@ -88,3 +98,30 @@ func (s *Server) RemoveRoute(w http.ResponseWriter, r *http.Request, ps httprout
 	}
 	w.Write(jsonResp)
 }
+
+func (s *Server) AddPeer(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+	var err error
+	ip := ps.ByName("ip")
+	peerid := ps.ByName("peerid")
+	s.peerTable[ip], err = peer.Decode(peerid)
+	if err != nil {
+		w.WriteHeader(http.StatusBadRequest)
+		w.Header().Set("Content-Type", "application/json")
+		jsonResp, err := json.Marshal(err)
+		if err != nil {
+			log.Fatalf("Error happened in JSON marshal. Err: %s", err)
+		}
+		w.Write(jsonResp)
+	}
+	s.cfg.Peers[ip] = config.Peer{ID: peerid}
+	w.WriteHeader(http.StatusOK)
+	w.Header().Set("Content-Type", "application/json")
+	jsonResp, err := json.Marshal(s.cfg.Peers)
+	if err != nil {
+		log.Fatalf("Error happened in JSON marshal. Err: %s", err)
+	}
+	w.Write(jsonResp)
+	// Setup P2P Discovery
+	go p2p.Discover(s.ctx, s.host, s.dht, s.peerTable)
+	go p2p.PrettyDiscovery(s.ctx, s.host, s.peerTable)
+}