mirror/osrg-gobgp
1
0
Fork 0
mirror of https://github.com/osrg/gobgp.git synced 2024-05-11 05:55:10 +00:00
Code Issues Releases Activity

Fixing all megacheck errors.

Browse Source 
Signed-off-by: FUJITA Tomonori <[email protected]>
This commit is contained in:
FUJITA Tomonori
2018-07-06 11:21:38 +09:00
parent 9ae30060eb
commit 69f866a77c
3 changed files with 4 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/policy.go
+3 -3
View File
@@ -25,9 +25,9 @@ import (
)
var (
repexpCommunity = regexp.MustCompile("(\\d+.)*\\d+:\\d+")
regexpLargeCommunity = regexp.MustCompile("\\d+:\\d+:\\d+")
regexpCommunityString = regexp.MustCompile("[\\^\\$]")
repexpCommunity = regexp.MustCompile(`(\d+.)*\d+:\d+`)
regexpLargeCommunity = regexp.MustCompile(`\d+:\d+:\d+`)
regexpCommunityString = regexp.MustCompile(`[\^\$]`)
)
func ParseCommunityRegexp(arg string) (*regexp.Regexp, error) {
config/default.go
+1 -3
View File
@@ -496,9 +496,7 @@ func OverwriteNeighborConfigWithPeerGroup(c *Neighbor, pg *PeerGroup) error {
overwriteConfig(&c.TtlSecurity.Config, &pg.TtlSecurity.Config, "neighbor.ttl-security.config", v)
if !v.IsSet("neighbor.afi-safis") {
for _, afiSafi := range pg.AfiSafis {
c.AfiSafis = append(c.AfiSafis, afiSafi)
}
c.AfiSafis = append(c.AfiSafis, pg.AfiSafis...)
}
return nil
table/destination.go
-42
View File
@@ -1039,45 +1039,3 @@ func (d *Destination) Select(option ...DestinationSelectOption) *Destination {
}
return NewDestination(d.nlri, 0, paths...)
}
type destinations []*Destination
func (d destinations) Len() int {
return len(d)
}
func (d destinations) Swap(i, j int) {
d[i], d[j] = d[j], d[i]
}
func (d destinations) Less(i, j int) bool {
switch d[i].routeFamily {
case bgp.RF_FS_IPv4_UC, bgp.RF_FS_IPv6_UC, bgp.RF_FS_IPv4_VPN, bgp.RF_FS_IPv6_VPN, bgp.RF_FS_L2_VPN:
var s, t *bgp.FlowSpecNLRI
switch d[i].routeFamily {
case bgp.RF_FS_IPv4_UC:
s = &d[i].nlri.(*bgp.FlowSpecIPv4Unicast).FlowSpecNLRI
t = &d[j].nlri.(*bgp.FlowSpecIPv4Unicast).FlowSpecNLRI
case bgp.RF_FS_IPv6_UC:
s = &d[i].nlri.(*bgp.FlowSpecIPv6Unicast).FlowSpecNLRI
t = &d[j].nlri.(*bgp.FlowSpecIPv6Unicast).FlowSpecNLRI
case bgp.RF_FS_IPv4_VPN:
s = &d[i].nlri.(*bgp.FlowSpecIPv4VPN).FlowSpecNLRI
t = &d[j].nlri.(*bgp.FlowSpecIPv4VPN).FlowSpecNLRI
case bgp.RF_FS_IPv6_VPN:
s = &d[i].nlri.(*bgp.FlowSpecIPv6VPN).FlowSpecNLRI
t = &d[j].nlri.(*bgp.FlowSpecIPv6VPN).FlowSpecNLRI
case bgp.RF_FS_L2_VPN:
s = &d[i].nlri.(*bgp.FlowSpecL2VPN).FlowSpecNLRI
t = &d[j].nlri.(*bgp.FlowSpecL2VPN).FlowSpecNLRI
}
if r, _ := bgp.CompareFlowSpecNLRI(s, t); r >= 0 {
return true
} else {
return false
}
default:
strings := sort.StringSlice{d[i].nlri.String(), d[j].nlri.String()}
return strings.Less(0, 1)
}
}