From dbcf5040d97cd1758393b35e7d3ffca02a69468e Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Fri, 11 Apr 2008 16:17:07 -0700 Subject: Fix for bug 3093 --- templates/interfaces/loopback/node.tag/ip/ospf/network/node.def | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def index 7b8aacf2..d49c4414 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def @@ -1,7 +1,7 @@ type: txt help: Network type -syntax:expression: $VAR(@) in "broadcast", "non-broadcast", "point-to-multipoint", "point-to-point"; \ - "Must be (broadcast|non-broadcast|point-to-multipoint|point-to-point)" +syntax:expression: $VAR(@) in "non-broadcast"; \ + "Must be non-broadcast" update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ @@ -12,7 +12,4 @@ delete:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"no ip ospf network \"; " comp_help: possible completions: - broadcast Set broadcast network type non-broadcast Set non-broadcast network type - point-to-multipoint Set point-to-multipoint network type - point-to-point Set point-to-point network type -- cgit v1.2.3 From 38fa1608498e7097ec968cb46bfab2c04e56ed6b Mon Sep 17 00:00:00 2001 From: Robert Bays Date: Fri, 11 Apr 2008 16:34:14 -0700 Subject: fix for bugs 3085,3114,3121,3119,3120 --- .../neighbor/node.tag/attribute-unchanged/node.def | 24 ++++++++++++---------- .../neighbor/node.tag/local-as/local-as/node.def | 2 +- .../node.tag/neighbor/node.tag/remote-as/node.def | 6 ++++-- .../parameters/confederation/peers/node.def | 2 +- .../bgp/node.tag/parameters/dampening/node.def | 17 +++++++-------- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def index c45b57f0..a0de96f2 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def @@ -7,17 +7,19 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "route if [ -f "/tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID" ]; then rm -rf /tmp/bgp-neighbor-$VAR(../@)-attribute-unchanged.$PPID; else - if [ -n "$VAR(./as-path/@)" ]; then - cond="as-path " ; - fi ; - if [ -n "$VAR(./med/@)" ]; then - cond="$cond med " ; - fi ; - if [ -n "$VAR(./next-hop/@)" ]; then - cond="$cond next-hop " ; - fi ; - if [ -n "$VAR(../remote-as/@)" ]; then - peer="remote-as $VAR(../remote-as/@)"; + ## the calls to check-typeless-node should be removed when the type-less node built-in returns correctly + ${vyatta_sbindir}/vyatta-check-typeless-node.pl "protocols bgp $VAR(../../@) neighbor $VAR(../@) attribute-unchanged as-path" + if [ $? -eq 0 ]; then + cond="as-path " ; + fi ; + ${vyatta_sbindir}/vyatta-check-typeless-node.pl "protocols bgp $VAR(../../@) neighbor $VAR(../@) attribute-unchanged med" + if [ $? -eq 0 ]; then + cond="$cond med " ; + fi ; + ${vyatta_sbindir}/vyatta-check-typeless-node.pl "protocols bgp $VAR(../../@) neighbor $VAR(../@) attribute-unchanged next-hop" + if [ $? -eq 0 ]; then + cond="$cond next-hop " ; + fi ; else peer="peer-group $VAR(../peer-group/@)"; fi; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def index 6a7a1f87..ba8f4c04 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/local-as/local-as/node.def @@ -2,6 +2,6 @@ type: u32 help: set the local AS number comp_help: \1 <1-4294967294>\tlocal AS number syntax:expression: $VAR(@) >=1 && $VAR(@) <= 4294967294; "local-as must be between 1 and 4294967294" -syntax:expression: $VAR(@) != $VAR(../../../@); "Cannot have local-as same as BGP AS number" +commit:expression: $VAR(@) != $VAR(../../../@); "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set local-as the same as the router AS" commit:expression: exec "/opt/vyatta/sbin/vyatta-bgp.pl --check-as --as $VAR(../../../@) --neighbor $VAR(../../@)" commit:expression: $VAR(../peer-group/) == ""; "protocols bgp $VAR(../../../@) neighbor $VAR(../../@): you can't set local-as for a neighbor in a peer-group" diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def index e668c22b..7830da49 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/remote-as/node.def @@ -4,5 +4,7 @@ comp_help: \1 <1-4294967294>\tAS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "remote-as must be between 1 and 4294967294" update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ -c "neighbor $VAR(../@) remote-as $VAR(@)" -delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ - -c "no neighbor $VAR(../@) remote-as $VAR(@)" +# commented out because deleting anything after remote-as will cause a failure in Quagga +# this is a temporary fix until node ordering is enabled +#delete: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ +# -c "no neighbor $VAR(../@) remote-as $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def index c07a346d..1d81c26f 100644 --- a/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def +++ b/templates/protocols/bgp/node.tag/parameters/confederation/peers/node.def @@ -1,7 +1,7 @@ multi: type: u32 help: set the peer ASs in the BGP confederation -comp_help: \1 <1-4294967294>\tpeer AS number numbers (ex: "435 234") +comp_help: \1 <1-4294967294>\tpeer AS number number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294; "confederation AS id must be between 1 and 4294967294" update: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../../@)" \ -c "bgp confederation peers $VAR(@)" diff --git a/templates/protocols/bgp/node.tag/parameters/dampening/node.def b/templates/protocols/bgp/node.tag/parameters/dampening/node.def index ed61e381..5ab6108f 100644 --- a/templates/protocols/bgp/node.tag/parameters/dampening/node.def +++ b/templates/protocols/bgp/node.tag/parameters/dampening/node.def @@ -1,11 +1,12 @@ help: enable route-flap dampening delete:expression: "touch /tmp/bgp-dampening.$PPID" -end: ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ - -c "no bgp dampening" ; - if [ -f "/tmp/bgp-dampening.$PPID" ]; then - rm -f "/tmp/bgp-dampening.$PPID" ; - else +# Note that there is a bug in quagga here. If bgpd gets two 'no bgp dampening' +# commands in a row it will crash +end: if [ -f "/tmp/bgp-dampening.$PPID" ]; then ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ - -c "bgp dampening $VAR(./half-life/@) $VAR(./re-use/@) $VAR(./start-suppress-time/@) $VAR(./max-suppress-time/@)" ; - fi ; - + -c "no bgp dampening" ; + rm -f "/tmp/bgp-dampening.$PPID" ; + else + ${vyatta_sbindir}/vyatta-vtysh.pl -c "configure terminal" -c "router bgp $VAR(../../@)" \ + -c "bgp dampening $VAR(./half-life/@) $VAR(./re-use/@) $VAR(./start-suppress-time/@) $VAR(./max-suppress-time/@)" ; + fi ; -- cgit v1.2.3 From 8f99d7ffcc23ec90950b2c959ed74816553f53c7 Mon Sep 17 00:00:00 2001 From: Robert Bays Date: Fri, 11 Apr 2008 18:00:17 -0700 Subject: add 2 lines acidentally deleted in last commit for attribute-unchanged --- .../bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def index a0de96f2..229827da 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/attribute-unchanged/node.def @@ -20,6 +20,8 @@ end: ${vyatta_sbindir}/vyatta-vtysh.pl -noerr -c "configure terminal" -c "route if [ $? -eq 0 ]; then cond="$cond next-hop " ; fi ; + if [ -n "$VAR(../remote-as/@)" ]; then + peer="remote-as $VAR(../remote-as/@)"; else peer="peer-group $VAR(../peer-group/@)"; fi; -- cgit v1.2.3 From 0ba7834d473d1debee66b1f5ac533e2c5dd59da9 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Mon, 14 Apr 2008 14:27:14 -0700 Subject: Updated autocomplet for loopback non-broadcast option --- templates/interfaces/loopback/node.tag/ip/ospf/network/node.def | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def index d49c4414..bc2ddf9d 100644 --- a/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def +++ b/templates/interfaces/loopback/node.tag/ip/ospf/network/node.def @@ -3,6 +3,8 @@ help: Network type syntax:expression: $VAR(@) in "non-broadcast"; \ "Must be non-broadcast" +allowed:echo non-broadcast + update:expression: "${vyatta_sbindir}/vyatta-vtysh.pl \ -c \"configure terminal\" -c \"interface $VAR(../../../@)\" \ -c \"ip ospf network $VAR(@) \"; " -- cgit v1.2.3 From b49ba8d58f27c94d0cc7dda38e3428aba1165183 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Wed, 16 Apr 2008 09:50:03 -0700 Subject: VC4.0.2 --- debian/changelog | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/debian/changelog b/debian/changelog index 543f2f3b..dbea98d8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,43 @@ +vyatta-cfg-quagga (0.5) unstable; urgency=low + + VC4.0.2 + [ Mark O'Brien ] + + * Fix for bug 3093 + * Updated autocomplet for loopback non-broadcast option + + [ Robert Bays ] + * fix for bugs 3085,3114,3121,3119,3120 + * add 2 lines acidentally deleted in last commit for attribute- + unchanged + + [ Stig Thormodsrud ] + * Fix 3115: set protocols ospf default-information originate always" + sends no "always" to the + * Fix 3128: "isis" needs to be removed under " protocols ospf access- + list <> export" + * Fix 3132: "set protocols ospf refresh timers <>" then commit failed + * Fix 3133: "delete protocols ospf timers throttle spf delay" commit + failed + * Fix 3131: "delete protocols ospf parameters abr-type" does not + remove " ospf abr-type standard" + * Fix 3130: "set protocols ospf compatible rfc1583" or " set protocols + ospf parameters + * Fix 3124: "set protocols ospf area <> area-type nssa translate + always" removed "...... nssa no-summary" from the routing engine + * Make sure OSPF area-type is set before default-cost. + * Fix 3129: "delete protocols ospf neighbor <> priority" should delete + the neighbor in the config as under the routing engine + * Fix 3126: ospf virtual-link authentication types should not be able + to be coexisted in the config + * Fix [Bug 3125] "...... range <> no-advertise" should be removed from + the config while it is removed from the routing engine by "set + protocols ospf area <> range <> substitute + + [ Mark O'Brien ] + + -- Mark O'Brien Wed, 16 Apr 2008 09:50:02 -0700 + vyatta-cfg-quagga (0.4) unstable; urgency=low 3.0.2 -- cgit v1.2.3 From a406b7f4d56362ef1871be392d38156a93cee5a9 Mon Sep 17 00:00:00 2001 From: An-Cheng Huang Date: Fri, 18 Apr 2008 11:09:27 -0700 Subject: don't signal watchlink if it's not running --- scripts/vyatta-linkstatus.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/vyatta-linkstatus.pl b/scripts/vyatta-linkstatus.pl index 25c1adfb..a1381850 100644 --- a/scripts/vyatta-linkstatus.pl +++ b/scripts/vyatta-linkstatus.pl @@ -90,7 +90,8 @@ unlink($exclude_lck_file); #finally kick the process -open(PID, "< /var/run/vyatta/quagga/watchlink.pid") || die "could not open '/var/run/vyatta/quagga/watchlink.pid'"; -my $foo = ; -system "kill -10 $foo"; -close(PID); +if (open(PID, "< /var/run/vyatta/quagga/watchlink.pid")) { + my $foo = ; + system "kill -10 $foo"; + close(PID); +} -- cgit v1.2.3 From 6d653d5a68a29d78043b9532b1c7d5d7ae91e136 Mon Sep 17 00:00:00 2001 From: Mark O'Brien Date: Sat, 19 Apr 2008 11:56:02 -0700 Subject: VC4.0.2 --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index dbea98d8..d71ca746 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +vyatta-cfg-quagga (0.6) unstable; urgency=low + + VC4.0.2 + [ Mark O'Brien ] + + + [ An-Cheng Huang ] + * don't signal watchlink if it's not running + + [ Mark O'Brien ] + + -- Mark O'Brien Sat, 19 Apr 2008 11:56:01 -0700 + vyatta-cfg-quagga (0.5) unstable; urgency=low VC4.0.2 -- cgit v1.2.3 From 69b0e51b4a3afeb6cf1fb8893c3e705412d988b0 Mon Sep 17 00:00:00 2001 From: rbalocca Date: Mon, 21 Apr 2008 12:30:23 -0700 Subject: Indicate the VC4.0.2 release candidate in the changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d71ca746..d76656cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,7 +13,7 @@ vyatta-cfg-quagga (0.6) unstable; urgency=low vyatta-cfg-quagga (0.5) unstable; urgency=low - VC4.0.2 + VC4.0.2 release candidate [ Mark O'Brien ] * Fix for bug 3093 -- cgit v1.2.3