From 880fb06128dceff1074116a8cdc4b9e24917ac0b Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 31 Mar 2009 09:58:12 -0700 Subject: 0.18.10 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 40885b3a..7ddd5209 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-quagga (0.18.10) unstable; urgency=low + + * Swap order of parameters + * Fix template for soft-reconfiguration + + -- Stephen Hemminger Tue, 31 Mar 2009 09:58:12 -0700 + vyatta-cfg-quagga (0.18.9) unstable; urgency=low * Fix error checking of remote-as -- cgit v1.2.3 From b6f1a09410983507a7cfc8b08dafbd13600ed8e5 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Tue, 31 Mar 2009 16:26:02 -0700 Subject: Remove redundant check-as call since it doesn't work with peer-groups. --- .../node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def index f52c6702..6524725c 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def @@ -1,6 +1,4 @@ help: Set inbound soft reconfiguration for this neighbor -commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as \ - --as $VAR(../../../@) --neighbor $VAR(../../@)" update: if [ -n "$VAR(../../remote-as/@)" ]; then peer="remote-as $VAR(../../remote-as/@)"; -- cgit v1.2.3 From 00273e4ade341a09695cde6e43d910f4b5be4a60 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Tue, 31 Mar 2009 16:27:09 -0700 Subject: 0.18.11 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 7ddd5209..45be486d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-quagga (0.18.11) unstable; urgency=low + + * Remove redundant check-as call since it doesn't work with peer- + groups. + + -- Stig Thormodsrud Tue, 31 Mar 2009 16:27:09 -0700 + vyatta-cfg-quagga (0.18.10) unstable; urgency=low * Swap order of parameters -- cgit v1.2.3 From 8a0924f19a09c8a543ad0c4f2034ecbf9d722115 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Tue, 31 Mar 2009 17:17:58 -0700 Subject: Revert "Remove redundant check-as call since it doesn't work with peer-groups." Wrong way to fix it. This reverts commit b6f1a09410983507a7cfc8b08dafbd13600ed8e5. --- .../node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def index 6524725c..f52c6702 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/soft-reconfiguration/inbound/node.def @@ -1,4 +1,6 @@ help: Set inbound soft reconfiguration for this neighbor +commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as \ + --as $VAR(../../../@) --neighbor $VAR(../../@)" update: if [ -n "$VAR(../../remote-as/@)" ]; then peer="remote-as $VAR(../../remote-as/@)"; -- cgit v1.2.3 From 2136ea04e709d79e2e3d288bf46df5aa397b656a Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Tue, 31 Mar 2009 17:43:08 -0700 Subject: Fix check-as to not check on a peer-group. --- scripts/bgp/vyatta-bgp.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 2609e381..610fb571 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -82,16 +82,17 @@ sub check_for_peer_groups { } } -# make sure nodes are either in a peer group of have +# make sure nodes are either in a peer group or have # a remote AS assigned to them. sub check_as { my ($neighbor, $as, $pg) = @_; die "neighbor not defined\n" unless $neighbor; - die "neighbor:$neighbor must be address\n" unless is_ip_v4_or_v6($neighbor); die "AS not defined\n" unless $as; # if this is peer-group then short circuit this + return if ! is_ip_v4_or_v6($neighbor); + my $config = new Vyatta::Config; $config->setLevel("protocols bgp $as neighbor $neighbor"); my $remoteas = $config->returnValue("remote-as"); -- cgit v1.2.3 From 30e1432faf2dfd1ec3ab78479355e08b262521e2 Mon Sep 17 00:00:00 2001 From: Stig Thormodsrud Date: Tue, 31 Mar 2009 17:44:30 -0700 Subject: 0.18.12 --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 45be486d..eb17ae65 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +vyatta-cfg-quagga (0.18.12) unstable; urgency=low + + * Revert "Remove redundant check-as call since it doesn't work with + peer-groups." + * Fix check-as to not check on a peer-group. + + -- Stig Thormodsrud Tue, 31 Mar 2009 17:44:30 -0700 + vyatta-cfg-quagga (0.18.11) unstable; urgency=low * Remove redundant check-as call since it doesn't work with peer- -- cgit v1.2.3