CLI VPNv4/VPNv6 filtering

gobgp CLI can filter VPNv4/VPNv6 prefixes with or without rd.

api/gobgp.proto

@@ -249,6 +249,7 @@ message TableLookupPrefix {
   enum Type { EXACT = 0; LONGER = 1; SHORTER = 2; }
   string prefix = 1;
   Type type = 2;
+  string rd = 3;
 }
 
 message ListPathRequest {

cmd/gobgp/neighbor.go

@@ -841,6 +841,7 @@ func showNeighborRib(r string, name string, args []string) error {
 	showMUP := false
 	showIdentifier := bgp.BGP_ADD_PATH_NONE
 	validationTarget := ""
+	rd := ""
 
 	def := addr2AddressFamily(net.ParseIP(name))
 	switch r {
@@ -889,6 +890,25 @@ func showNeighborRib(r string, name string, args []string) error {
 				option = api.TableLookupPrefix_LONGER
 			} else if args[0] == "shorter-prefixes" {
 				option = api.TableLookupPrefix_SHORTER
+			} else if args[0] == "rd" {
+				switch rf {
+				case bgp.RF_IPv4_VPN, bgp.RF_IPv6_VPN:
+				case bgp.RF_EVPN:
+					return fmt.Errorf("route distinguisher option for %q family is not implemented yet", rf)
+				default:
+					return fmt.Errorf("route distinguisher is not applicable to %q family", rf)
+				}
+
+				if len(args) < 2 {
+					return fmt.Errorf("no route distinguisher value specified")
+				}
+				args = args[1:]
+
+				rd := args[0]
+				_, err = bgp.ParseRouteDistinguisher(rd)
+				if err != nil {
+					return err
+				}
 			} else if args[0] == "validation" {
 				if r != cmdAdjIn {
 					return fmt.Errorf("RPKI information is supported for only adj-in")
@@ -901,6 +921,7 @@ func showNeighborRib(r string, name string, args []string) error {
 		}
 		filter = []*api.TableLookupPrefix{{
 			Prefix: target,
+			Rd:     rd,
 			Type:   option,
 		},
 		}

docs/sources/cli-command-syntax.md

@@ -46,7 +46,7 @@ gobgp has the following subcommands.
 # show all Route information
 % gobgp global rib [-a <address family>]
 # show a specific route information
-% gobgp global rib [<prefix>|<host>] [longer-prefixes|shorter-prefixes] [-a <address family>]
+% gobgp global rib [<prefix>|<host>] [rd <rd>] [longer-prefixes|shorter-prefixes] [-a <address family>]
 # show table summary
 % gobgp global rib summary [-a <address family>]
 ```
@@ -154,7 +154,7 @@ The following options can be specified in the neighbor subcommand:
 # show all routes in [local|adj-in|adj-out] table
 % gobgp neighbor <neighbor address> [local|adj-in|adj-out] [-a <address family>]
 # show a specific route in [local|adj-in|adj-out] table
-% gobgp neighbor <neighbor address> [local|adj-in|adj-out] [<prefix>|<host>] [longer-prefixes|shorter-prefixes] [-a <address family>]
+% gobgp neighbor <neighbor address> [local|adj-in|adj-out] [<prefix>|<host>] [rd <rd>] [longer-prefixes|shorter-prefixes] [-a <address family>]
 # show table summary
 % gobgp neighbor <neighbor address> [local|adj-in|adj-out] summary [-a <address family>]
 # show RPKI detailed information in adj-in table

internal/pkg/table/table.go

@@ -39,6 +39,7 @@ const (
 
 type LookupPrefix struct {
 	Prefix string
+	RD     string
 	LookupOption
 }
 
@@ -251,7 +252,6 @@ func (t *Table) GetLongerPrefixDestinations(key string) ([]*Destination, error)
 		if err != nil {
 			return nil, err
 		}
-
 		ones, bits := network.Mask.Size()
 
 		r := critbitgo.NewNet()
@@ -270,16 +270,19 @@ func (t *Table) GetLongerPrefixDestinations(key string) ([]*Destination, error)
 
 			r.Add(nlriToIPNet(dst.nlri), dst)
 		}
+
 		p := &net.IPNet{
 			IP:   network.IP,
 			Mask: net.CIDRMask((ones>>3)<<3, bits),
 		}
+
 		mask := 0
 		div := 0
 		if ones%8 != 0 {
 			mask = 8 - ones&0x7
 			div = ones >> 3
 		}
+
 		r.WalkPrefix(p, func(n *net.IPNet, v interface{}) bool {
 			if mask != 0 && n.IP[div]>>mask != p.IP[div]>>mask {
 				return true
@@ -548,23 +551,57 @@ func (t *Table) Select(option ...TableSelectOption) (*Table, error) {
 			for _, p := range prefixes {
 				switch p.LookupOption {
 				case LOOKUP_LONGER:
-					ds, err := t.GetLongerPrefixDestinations(p.Prefix)
+					_, prefix, err := net.ParseCIDR(p.Prefix)
 					if err != nil {
 						return nil, err
 					}
+
+					if p.RD == "" {
+						for _, dst := range t.GetDestinations() {
+							tablePrefix := nlriToIPNet(dst.nlri)
+
+							if bgp.ContainsCIDR(prefix, tablePrefix) {
+								r.setDestination(dst)
+							}
+						}
+
+						return r, nil
+					}
+
+					ds, err := t.GetLongerPrefixDestinations(p.RD + ":" + p.Prefix)
+					if err != nil {
+						return nil, err
+					}
+
 					for _, dst := range ds {
 						if d := dst.Select(dOption); d != nil {
 							r.setDestination(d)
 						}
 					}
 				case LOOKUP_SHORTER:
-					rd, addr, network, err := bgp.ParseVPNPrefix(p.Prefix)
+					addr, prefix, err := net.ParseCIDR(p.Prefix)
 					if err != nil {
 						return nil, err
 					}
 
-					ones, _ := network.Mask.Size()
+					if p.RD == "" {
+						for _, dst := range t.GetDestinations() {
+							tablePrefix := nlriToIPNet(dst.nlri)
 
+							if bgp.ContainsCIDR(tablePrefix, prefix) {
+								r.setDestination(dst)
+							}
+						}
+
+						return r, nil
+					}
+
+					rd, err := bgp.ParseRouteDistinguisher(p.RD)
+					if err != nil {
+						return nil, err
+					}
+
+					ones, _ := prefix.Mask.Size()
 					for i := ones; i >= 0; i-- {
 						_, prefix, _ := net.ParseCIDR(addr.String() + "/" + strconv.Itoa(i))
 
@@ -574,7 +611,18 @@ func (t *Table) Select(option ...TableSelectOption) (*Table, error) {
 						}
 					}
 				default:
-					err := f(p.Prefix)
+					if p.RD == "" {
+						for _, dst := range t.GetDestinations() {
+							net := nlriToIPNet(dst.nlri)
+							if net.String() == p.Prefix {
+								r.setDestination(dst)
+							}
+						}
+
+						return r, nil
+					}
+
+					err := f(p.RD + ":" + p.Prefix)
 					if err != nil {
 						return nil, err
 					}