internal reprensentation of bgp community change to plain community value

Author: micho7

Diff for: pkg/bgpserver/connector.go

@@ -16,11 +16,8 @@ package bgpserver
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"log/slog"
-	"strconv"
-	"strings"
 
 	gobgpapi "github.com/osrg/gobgp/v3/api"
 	gobgpbgp "github.com/osrg/gobgp/v3/pkg/packet/bgp"
@@ -30,13 +27,13 @@ import (
 
 type Route struct {
 	Prefix    string
-	Community string
+	Community uint32
 }
 
 type Connector interface {
 	Start(ctx context.Context) error
 	AddPeer(neighbor string, remoteAS uint32, remotePort uint32, keepaliveIntervalSec uint64) error
-	AddPath(prefix string, prefixLen uint32, nexthop string, community string) error
+	AddPath(prefix string, prefixLen uint32, nexthop string, community uint32) error
 	ListPath() ([]Route, error)
 }
 
@@ -132,7 +129,7 @@ func (bs *bgpServerConnector) AddPeer(neighbor string, remoteAS uint32, remotePo
 	)
 }
 
-func (bs *bgpServerConnector) AddPath(prefix string, prefixLen uint32, nexthop string, community string) error {
+func (bs *bgpServerConnector) AddPath(prefix string, prefixLen uint32, nexthop string, community uint32) error {
 	nlri1, err := apb.New(&gobgpapi.IPAddressPrefix{
 		Prefix:    prefix,
 		PrefixLen: prefixLen,
@@ -149,12 +146,8 @@ func (bs *bgpServerConnector) AddPath(prefix string, prefixLen uint32, nexthop s
 		attrNextHop, _ := apb.New(&gobgpapi.NextHopAttribute{
 			NextHop: nexthop,
 		})
-		encodedCommunity, err := encodeCommunity(community)
-		if err != nil {
-			return err
-		}
 		attrCommunities, _ := apb.New(&gobgpapi.CommunitiesAttribute{
-			Communities: []uint32{encodedCommunity},
+			Communities: []uint32{community},
 		})
 		attrs = []*apb.Any{attrOrigin, attrNextHop, attrCommunities}
 	}
@@ -199,11 +192,10 @@ func (bs *bgpServerConnector) ListPath() ([]Route, error) {
 				}
 
 				for _, comm := range ca.Communities {
-					decodedCommunity := decodeCommunity(comm)
-					bs.logger.Debug("ListPath: found community", "community", decodedCommunity)
+					bs.logger.Debug("ListPath: found community", "community", EncodeCommunity(comm))
 					routes = append(routes, Route{
 						Prefix:    d.Prefix,
-						Community: decodedCommunity,
+						Community: comm,
 					})
 				}
 			}
@@ -213,29 +205,8 @@ func (bs *bgpServerConnector) ListPath() ([]Route, error) {
 	return routes, err
 }
 
-// encodeCommunity converts plain community value to human readable notation(for example 65001:10)
-func encodeCommunity(comm string) (uint32, error) {
-	nodes := strings.Split(comm, ":")
-	if len(nodes) != 2 {
-		return 0, errors.New("invaild community")
-	}
-
-	upeer, err := strconv.Atoi(nodes[0])
-	if err != nil {
-		return 0, err
-	}
-
-	lower, err := strconv.Atoi(nodes[1])
-	if err != nil {
-		return 0, err
-	}
-	commEncoded := uint32(upeer<<16 | lower)
-
-	return commEncoded, nil
-}
-
-// decodeCommunity converts human readable notation to plain community value
-func decodeCommunity(comm uint32) string {
+// EncodeCommunity converts plain community value to human readable notation(for example 65001:10)
+func EncodeCommunity(comm uint32) string {
 	upper := comm >> 16
 	lower := comm & 0xffff
 	commDecoded := fmt.Sprintf("%d:%d", upper, lower)

Diff for: pkg/bgpserver/fake_connector.go

@@ -37,7 +37,7 @@ func (bs *FakeBgpServerConnector) AddPeer(_ string, _ uint32, _ uint32, _ uint64
 	return nil
 }
 
-func (bs *FakeBgpServerConnector) AddPath(prefix string, prefixLen uint32, _ string, _ string) error {
+func (bs *FakeBgpServerConnector) AddPath(prefix string, prefixLen uint32, _ string, _ uint32) error {
 	p := fmt.Sprintf("%s/%d", prefix, prefixLen)
 	bs.RouteConfigured[p] = true
 

Diff for: pkg/controller/controller.go

@@ -72,22 +72,22 @@ const (
 )
 
 const (
-	bgpCommunity_Fault     = "65001:1"
-	bgpCommunity_Candidate = "65001:2"
-	bgpCommunity_Primary   = "65001:3"
-	bgpCommunity_Replica   = "65001:4"
-	bgpCommunity_Anchor    = "65001:10"
+	bgpCommunity_Fault     = 65001<<16 | 1  // 65001:1
+	bgpCommunity_Candidate = 65001<<16 | 2  // 65001:2
+	bgpCommunity_Primary   = 65001<<16 | 3  // 65001:3
+	bgpCommunity_Replica   = 65001<<16 | 4  // 65001:4
+	bgpCommunity_Anchor    = 65001<<16 | 10 // 65001:10
 )
 
 var (
-	bgpCommunityToState = map[string]State{
+	bgpCommunityToState = map[uint32]State{
 		bgpCommunity_Fault:     StateFault,
 		bgpCommunity_Candidate: StateCandidate,
 		bgpCommunity_Primary:   StatePrimary,
 		bgpCommunity_Replica:   StateReplica,
 		bgpCommunity_Anchor:    StateAnchor,
 	}
-	stateToBgpCommunity = map[State]string{
+	stateToBgpCommunity = map[State]uint32{
 		StateFault:     bgpCommunity_Fault,
 		StateCandidate: bgpCommunity_Candidate,
 		StatePrimary:   bgpCommunity_Primary,
@@ -295,12 +295,12 @@ func (c *Controller) preDecideNextStateHandler() error {
 
 	currentNeighbors := newNeighborSet()
 	for _, route := range routes {
-		c.logger.Debug(fmt.Sprintf("found route %s %s", route.Prefix, route.Community))
+		c.logger.Debug(fmt.Sprintf("found route %s %s", route.Prefix, bgpserver.EncodeCommunity(route.Community)))
 
 		// parse community
 		state, ok := bgpCommunityToState[route.Community]
 		if !ok {
-			return fmt.Errorf("unknown community: %s", route.Community)
+			return fmt.Errorf("unknown community: %s", bgpserver.EncodeCommunity(route.Community))
 		}
 
 		// parse prefix
@@ -404,7 +404,7 @@ func (c *Controller) advertiseSelfNetIFAddress() error {
 	if !ok {
 		return errors.New("unknown state")
 	}
-	c.logger.Info("advertising my host address", "hostaddress", c.hostAddress, "community", comm)
+	c.logger.Info("advertising my host address", "hostaddress", c.hostAddress, "community", bgpserver.EncodeCommunity(comm))
 	return c.bgpServerConnector.AddPath(c.hostAddress, 32, c.hostAddress, comm)
 }