use pools in routes decoding

pkg/api/response.go

@@ -228,9 +228,9 @@ func (communities ExtCommunities) Unique() ExtCommunities {
 
 // BGPInfo is a set of BGP attributes
 type BGPInfo struct {
-	Origin           string         `json:"origin"`
+	Origin           *string        `json:"origin"`
 	AsPath           []int          `json:"as_path"`
-	NextHop          string         `json:"next_hop"`
+	NextHop          *string        `json:"next_hop"`
 	Communities      Communities    `json:"communities"`
 	LargeCommunities Communities    `json:"large_communities"`
 	ExtCommunities   ExtCommunities `json:"ext_communities"`

pkg/pools/pools.go

@@ -10,8 +10,11 @@ import "log"
 // Neighbors stores neighbor IDs
 var Neighbors *String
 
-// Networks stores network ip addresses
-var Networks *String
+// Networks4 stores network ip v4 addresses
+var Networks4 *String
+
+// Networks6 stores network ip v6 addresses
+var Networks6 *String
 
 // Interfaces stores interfaces like: eth0, bond0 etc...
 var Interfaces *String
@@ -36,7 +39,8 @@ func init() {
 	log.Println("initializing memory pools")
 
 	Neighbors = NewString()
-	Networks = NewString()
+	Networks4 = NewString()
+	Networks6 = NewString()
 	Interfaces = NewString()
 	Gateways4 = NewString()
 	Gateways6 = NewString()

pkg/sources/birdwatcher/parsers.go

@@ -13,6 +13,7 @@ import (
 
 	"github.com/alice-lg/alice-lg/pkg/api"
 	"github.com/alice-lg/alice-lg/pkg/decoders"
+	"github.com/alice-lg/alice-lg/pkg/pools"
 )
 
 // Convert server time string to time
@@ -230,6 +231,8 @@ func parseNeighborsShort(bird ClientResponse, config Config) (api.NeighborsStatu
 
 // Parse route bgp info
 func parseRouteBgpInfo(data interface{}) *api.BGPInfo {
+	gwpool := pools.Gateways4 // Let's see
+
 	bgpData, ok := data.(map[string]interface{})
 	if !ok {
 		// Info is missing
@@ -245,9 +248,11 @@ func parseRouteBgpInfo(data interface{}) *api.BGPInfo {
 	med, _ := strconv.Atoi(decoders.String(bgpData["med"], "0"))
 
 	bgp := &api.BGPInfo{
-		Origin:           decoders.String(bgpData["origin"], "unknown"),
-		AsPath:           asPath,
-		NextHop:          decoders.String(bgpData["next_hop"], "unknown"),
+		Origin: pools.Origins.Acquire(
+			decoders.String(bgpData["origin"], "unknown")),
+		AsPath: pools.ASPaths.Acquire(asPath),
+		NextHop: gwpool.Acquire(
+			decoders.String(bgpData["next_hop"], "unknown")),
 		LocalPref:        localPref,
 		Med:              med,
 		Communities:      communities,
@@ -308,6 +313,9 @@ func parseRouteData(
 	config Config,
 	keepDetails bool,
 ) *api.Route {
+	gwpool := pools.Gateways4  // Let's see
+	netpool := pools.Networks4 // same...
+
 	age := parseRelativeServerTime(rdata["age"], config)
 	rtype := decoders.StringList(rdata["type"])
 	bgpInfo := parseRouteBgpInfo(rdata["bgp"])
@@ -322,7 +330,6 @@ func parseRouteData(
 		details = json.RawMessage(detailsJSON)
 	}
 
-	// Pool: Gateways
 	gateway := decoders.String(rdata["gateway"], "unknown gateway")
 	learntFrom := decoders.String(rdata["learnt_from"], "")
 	if learntFrom == "" {
@@ -330,17 +337,20 @@ func parseRouteData(
 	}
 
 	route := &api.Route{
-		ID:         decoders.String(rdata["network"], "unknown"),
-		NeighborID: decoders.String(rdata["from_protocol"], "unknown neighbor"),
+		ID: decoders.String(rdata["network"], "unknown"),
 
-		Network:    decoders.String(rdata["network"], "unknown net"),
-		Interface:  decoders.String(rdata["interface"], "unknown interface"),
+		NeighborID: pools.Neighbors.Acquire(
+			decoders.String(rdata["from_protocol"], "unknown neighbor")),
+		Network: netpool.Acquire(
+			decoders.String(rdata["network"], "unknown net")),
+		Interface: pools.Interfaces.Acquire(
+			decoders.String(rdata["interface"], "unknown interface")),
 		Metric:     decoders.Int(rdata["metric"], -1),
 		Primary:    decoders.Bool(rdata["primary"], false),
-		LearntFrom: learntFrom,
-		Gateway:    gateway,
+		LearntFrom: gwpool.Acquire(learntFrom),
+		Gateway:    gwpool.Acquire(gateway),
 		Age:        age,
-		Type:       rtype,
+		Type:       pools.Types.Acquire(rtype),
 		BGP:        bgpInfo,
 
 		Details: &details,

pkg/sources/birdwatcher/source.go

@@ -118,16 +118,16 @@ func (b *GenericBirdwatcher) filterProtocolsPipe(
 
 func (b *GenericBirdwatcher) filterRoutesByPeerOrLearntFrom(
 	routes api.Routes,
-	peer string,
-	learntFrom string,
+	peerPtr *string,
+	learntFromPtr *string,
 ) api.Routes {
 	resultRoutes := make(api.Routes, 0, len(routes))
 
 	// Choose routes with next_hop == gateway of this neighbor
 	for _, route := range routes {
-		if (route.Gateway == peer) ||
-			(route.Gateway == learntFrom) ||
-			(route.LearntFrom == peer) {
+		if (route.Gateway == peerPtr) ||
+			(route.Gateway == learntFromPtr) ||
+			(route.LearntFrom == peerPtr) {
 			resultRoutes = append(resultRoutes, route)
 		}
 	}

pkg/sources/birdwatcher/source_multitable.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/alice-lg/alice-lg/pkg/api"
 	"github.com/alice-lg/alice-lg/pkg/decoders"
+	"github.com/alice-lg/alice-lg/pkg/pools"
 )
 
 // MultiTableBirdwatcher implements a birdwatcher with
@@ -365,6 +366,7 @@ func (src *MultiTableBirdwatcher) fetchRequiredRoutes(
 	// Perform route deduplication
 	importedRoutes := api.Routes{}
 	if len(receivedRoutes) > 0 {
+		// TODO: maybe we can utilize the ptr here
 		peer := receivedRoutes[0].Gateway
 		learntFrom := receivedRoutes[0].LearntFrom
 
@@ -682,8 +684,8 @@ func (src *MultiTableBirdwatcher) AllRoutes(
 	// We load the filtered routes asynchronously with workers.
 	type fetchFilteredReq struct {
 		protocolID string
-		peer       string
-		learntFrom string
+		peer       *string
+		learntFrom *string
 	}
 	reqQ := make(chan fetchFilteredReq, 1000)
 	resQ := make(chan api.Routes, 1000)
@@ -710,11 +712,16 @@ func (src *MultiTableBirdwatcher) AllRoutes(
 		}()
 	}
 
+	gwpool := pools.Gateways4
+
 	// Fill request queue
 	go func() {
 		for protocolID, protocolsData := range protocolsBgp["protocols"].(map[string]interface{}) {
-			peer := protocolsData.(map[string]interface{})["neighbor_address"].(string)
-			learntFrom := decoders.String(protocolsData.(map[string]interface{})["learnt_from"], peer)
+			peer := gwpool.Acquire(
+				protocolsData.(map[string]interface{})["neighbor_address"].(string))
+			learntFrom := gwpool.Acquire(
+				decoders.String(protocolsData.(map[string]interface{})["learnt_from"], *peer))
+
 			reqQ <- fetchFilteredReq{
 				protocolID: protocolID,
 				peer:       peer,