Merge branch 'larkspur' of http://git.vyatta.com/vyatta-cfg-quagga into larkspur

6 files changed, 50 insertions, 11 deletions

diff --git a/debian/changelog b/debian/changelog
index b714d39f..b1d4d4c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,31 @@
+vyatta-cfg-quagga (0.18.83) unstable; urgency=low
+
+  * Fix email address causing debian warnings
+  * Revert "Use net_set to avoid using sudo"
+  * Need full path to arp command
+  * Fix bogus ospf wireless vif nodes
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Fri, 09 Jul 2010 18:14:26 -0700
+
+vyatta-cfg-quagga (0.18.82) unstable; urgency=low
+
+  [ Stephen Hemminger ]
+  * Use net_set to avoid using sudo
+  * No longer need sudo for arp
+
+  [ An-Cheng Huang ]
+  * remove leftover script as discussed
+
+  [ Stephen Hemminger ]
+  * Add ttl-security option to peer-group
+
+ -- Stephen Hemminger <stephen.hemminger@vyatta.com>  Fri, 09 Jul 2010 17:46:08 -0700
+
 vyatta-cfg-quagga (0.18.81) unstable; urgency=low
 
   * fix for bug 5713
 
- -- Robert Bays <rbays@roatan>  Mon, 21 Jun 2010 10:58:55 -0700
+ -- Robert Bays <rbays@vyatta.com>  Mon, 21 Jun 2010 10:58:55 -0700
 
 vyatta-cfg-quagga (0.18.80) unstable; urgency=low
 
@@ -18,13 +41,13 @@ vyatta-cfg-quagga (0.18.79) unstable; urgency=low
 
   * fix for bug 874: allow setting administrative distance
 
- -- Robert Bays <rbays@roatan>  Tue, 08 Jun 2010 12:33:11 -0700
+ -- Robert Bays <rbays@vyatta.com>  Tue, 08 Jun 2010 12:33:11 -0700
 
 vyatta-cfg-quagga (0.18.78) unstable; urgency=low
 
   * fix aggregate-address command
 
- -- Robert Bays <rbays@roatan>  Mon, 07 Jun 2010 15:56:21 -0700
+ -- Robert Bays <rbays@vyatta.com>  Mon, 07 Jun 2010 15:56:21 -0700
 
 vyatta-cfg-quagga (0.18.77) unstable; urgency=low
 
@@ -36,19 +59,19 @@ vyatta-cfg-quagga (0.18.77) unstable; urgency=low
   * clean up potential unitialized var reference
   * fix stupid var def mistake
 
- -- Robert Bays <rbays@roatan>  Fri, 04 Jun 2010 16:59:51 -0700
+ -- Robert Bays <rbays@vyatta.com>  Fri, 04 Jun 2010 16:59:51 -0700
 
 vyatta-cfg-quagga (0.18.76) unstable; urgency=low
 
   * fix for bug 5653
 
- -- Robert Bays <rbays@roatan>  Wed, 02 Jun 2010 17:15:41 -0700
+ -- Robert Bays <rbays@vyatta.com>  Wed, 02 Jun 2010 17:15:41 -0700
 
 vyatta-cfg-quagga (0.18.75) unstable; urgency=low
 
   * re-add the disable-send-comunity node to peer-groups
 
- -- Robert Bays <rbays@roatan>  Tue, 25 May 2010 16:26:01 -0700
+ -- Robert Bays <rbays@vyatta.com>  Tue, 25 May 2010 16:26:01 -0700
 
 vyatta-cfg-quagga (0.18.74) unstable; urgency=low
 
@@ -60,7 +83,7 @@ vyatta-cfg-quagga (0.18.74) unstable; urgency=low
   * change the system call in _sendQuaggaCommand().  with the selective
     noerr fixed,
 
- -- Robert Bays <rbays@roatan>  Sun, 23 May 2010 01:00:39 -0700
+ -- Robert Bays <rbays@vyatta.com>  Sun, 23 May 2010 01:00:39 -0700
 
 vyatta-cfg-quagga (0.18.73) unstable; urgency=low
 
diff --git a/gen-interface-templates.pl b/gen-interface-templates.pl
index fedd4c63..3b2e39ab 100755
--- a/gen-interface-templates.pl
+++ b/gen-interface-templates.pl
@@ -35,7 +35,7 @@ my %interface_hash = (
     'ethernet/node.tag/vif/node.tag'                => '$VAR(../@).$VAR(@)',
     'ethernet/node.tag/vif/node.tag/pppoe/node.tag' => 'pppoe$VAR(@)',
     'wireless/node.tag'                             => '$VAR(@)',
-    'wireless/vif/node.tag'                         => '$VAR(../@).$VAR(@)',
+    'wireless/node.tag/vif/node.tag'                => '$VAR(../@).$VAR(@)',
     'pseudo-ethernet/node.tag'                      => '$VAR(@)',
 #   'pseudo-ethernet/node.tag/vif/node.tag'         => '$VAR(../@).$VAR(@)',
     'bonding/node.tag'                              => '$VAR(@)',
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index 44f5d329..e4e626e6 100755
--- a/scripts/bgp/vyatta-bgp.pl
+++ b/scripts/bgp/vyatta-bgp.pl
@@ -1009,6 +1009,10 @@ my %qcom = (
       set => 'router bgp #3 ; neighbor #5 timers connect #8',
       del => 'router bgp #3 ; no neighbor #5 timers connect #8',
   },
+  'protocols bgp var peer-group var ttl-security hops' => {
+      set => 'router bgp #3 ; neighbor #5 ttl-security hops #8',
+      del => 'router bgp #3 ; no neighbor #5 ttl-security hops #8',
+  },
   'protocols bgp var peer-group var unsuppress-map' => {
       set => 'router bgp #3 ; neighbor #5 unsuppress-map #7',
       del => 'router bgp #3 ; no neighbor #5 unsuppress-map #7',
diff --git a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
index 05be9f5b..f8127f10 100644
--- a/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
+++ b/templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def
@@ -1,2 +1,7 @@
+type: u32
 help: Set ttl security mechanism for this BGP peer
+comp_help: possible completions:
+  <1-254>   maximum number of hops that separate two peers
+syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254 ; \
+    "ttl-security must be between 1 and 254"
 commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security: you can't set both ebgp-multihop and ttl-security"
diff --git a/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def
new file mode 100644
index 00000000..bf7c0f39
--- /dev/null
+++ b/templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def
@@ -0,0 +1,8 @@
+type: u32
+help: Set ttl security mechanism for this peer-group
+comp_help: possible completions:
+  <1-254>   maximum number of hops that separate two peers
+syntax:expression: $VAR(@) >=1 && $VAR(@) <= 254 ; \
+    "ttl-security must be between 1 and 254"
+
+commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --not-exists \"protocols bgp $VAR(../../@) neighbor $VAR(../@) ebgp-multihop\" "; "protocols bgp $VAR(../../@) neighbor $VAR(../@) ttl-security: you can't set both ebgp-multihop and ttl-security"
diff --git a/templates/protocols/static/arp/node.def b/templates/protocols/static/arp/node.def
index 0174b24c..a7905c57 100644
--- a/templates/protocols/static/arp/node.def
+++ b/templates/protocols/static/arp/node.def
@@ -35,9 +35,8 @@ comp_help: Possible completions:
 end:
 	ipaddr=$VAR(@)
 	hwaddr=$VAR(hwaddr/@)
-
-	sudo arp -d $ipaddr > /dev/null
+	/usr/sbin/arp -d $ipaddr > /dev/null
 	if [ -n "$hwaddr" ]; then
-	    sudo arp -s $ipaddr $hwaddr
+	    /usr/sbin/arp -s $ipaddr $hwaddr
 	fi
 	exit 0