summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-09 17:46:07 -0700
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-07-09 17:46:07 -0700
commitcf928cbea5e5733eca4ff65f22637c3cbd906ff8 (patch)
tree9fb2061314a5c9d99dc664a0308c70ed355e0e96
parent11e3c9aa29c64e6f66239f6c3fdf414004f71ea7 (diff)
parent6cfb22fef8cd535657abab13c4a0e34763498fa4 (diff)
downloadvyatta-cfg-quagga-cf928cbea5e5733eca4ff65f22637c3cbd906ff8.tar.gz
vyatta-cfg-quagga-cf928cbea5e5733eca4ff65f22637c3cbd906ff8.zip
Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-cfg-quagga into larkspur
-rwxr-xr-xscripts/bgp/vyatta-bgp.pl4
-rw-r--r--templates/protocols/bgp/node.tag/neighbor/node.tag/ttl-security/node.def5
-rw-r--r--templates/protocols/bgp/node.tag/peer-group/node.tag/ttl-security/node.def8
3 files changed, 17 insertions, 0 deletions
diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl
index b2119dbc..849b4284 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"