fix: only-announce parameter (#166)

natesales · natesales · commit 906822aa5fb1 · 2023-04-02T18:12:24.000-04:00
diff --git a/pkg/embed/templates/peer.tmpl b/pkg/embed/templates/peer.tmpl
@@ -245,7 +245,7 @@ protocol bgp {{ UniqueProtocolName $peer.ProtocolName $af $peer.ASN }} {
             {{ end }}
 
             {{ if not (Empty $peer.OnlyAnnounce) }}
-            if (!net ~ [
+            if !(net ~ [
             {{ BirdSet $peer.OnlyAnnounce }}
             ]) then _reject("prefix not in only-announce list");
             {{ end }}
diff --git a/pkg/process/process.go b/pkg/process/process.go
@@ -253,8 +253,8 @@ func Load(configBlob []byte) (*config.Config, error) {
 			log.Fatalf("Both DefaultLocalPref and OptimizeInbound set, Pathvector cannot optimize this peer.")
 		}
 
-		if peerData.OnlyAnnounce != nil && peerData.AnnounceAll != nil {
-			log.Fatalf("[%s] only-announce and announce-all cannot both be set", peerName)
+		if peerData.OnlyAnnounce != nil && util.Deref(peerData.AnnounceAll) {
+			log.Fatalf("[%s] only-announce and announce-all cannot both be true", peerName)
 		}
 
 		// Categorize prefix-communities

Original file line number	Diff line number	Diff line change
`@@ -253,8 +253,8 @@ func Load(configBlob []byte) (*config.Config, error) {`
`253`	`253`	`log.Fatalf("Both DefaultLocalPref and OptimizeInbound set, Pathvector cannot optimize this peer.")`
`254`	`254`	`}`
`255`	`255`
`256`		`- if peerData.OnlyAnnounce != nil && peerData.AnnounceAll != nil {`
`257`		`- log.Fatalf("[%s] only-announce and announce-all cannot both be set", peerName)`
	`256`	`+ if peerData.OnlyAnnounce != nil && util.Deref(peerData.AnnounceAll) {`
	`257`	`+ log.Fatalf("[%s] only-announce and announce-all cannot both be true", peerName)`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`// Categorize prefix-communities`