From 64ae8ae1477474ca94c432a6664a73cba220fd36 Mon Sep 17 00:00:00 2001 From: Michael Larson Date: Thu, 18 Nov 2010 16:47:34 -0800 Subject: fix for 6069 --- templates/protocols/bgp/node.def | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'templates') diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 3e9e6b51..3f55aab6 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -7,4 +7,9 @@ val_help: u32:1-4294967294; AS number syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ "AS number must be between 1 and 4294967294" -end: /opt/vyatta/sbin/vyatta-bgp.pl --main +end: + +if [ "$COMMIT_SIBLING_POSITION" = "FIRST" ] || \ + [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then + /opt/vyatta/sbin/vyatta-bgp.pl --main +fi; -- cgit v1.2.3 From c16eed83ace66660a643273b052ebaa537afd373 Mon Sep 17 00:00:00 2001 From: Robert Bays Date: Thu, 18 Nov 2010 17:50:45 -0800 Subject: fix bug 6430 --- scripts/bgp/vyatta-bgp.pl | 13 ++++++++++--- templates/protocols/bgp/node.tag/neighbor/node.def | 2 +- 2 files changed, 11 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/scripts/bgp/vyatta-bgp.pl b/scripts/bgp/vyatta-bgp.pl index 22e8aa9e..2b623bc0 100755 --- a/scripts/bgp/vyatta-bgp.pl +++ b/scripts/bgp/vyatta-bgp.pl @@ -1070,11 +1070,18 @@ was_iBGP_peer($neighbor, $as) if ($wasiBGPpeer); exit 0; -# Make sure the peer IP is properly formatted +# Make sure the peer IP isn't a local system IP sub check_neighbor_ip { my $neighbor = shift; + my $local_ips; - exit 1 if ! is_ip_v4_or_v6($neighbor); + $local_ips = `ip addr | grep inet`; + $local_ips =~ s/\s+inet(6*)\s(\S+)\/.+/$2 /g; + + if ($local_ips =~ /$neighbor/g) { + die "Can't set neighbor address to local system IP.\n"; + } + exit 0; } @@ -1096,7 +1103,7 @@ sub check_peergroup_name { } # Make sure we aren't deleteing a peer-group that has -# neighbors configured to us it +# neighbors configured to it sub check_for_peer_groups { my $config = new Vyatta::Config; my $pg = shift; diff --git a/templates/protocols/bgp/node.tag/neighbor/node.def b/templates/protocols/bgp/node.tag/neighbor/node.def index 122f2f17..a41fc20d 100644 --- a/templates/protocols/bgp/node.tag/neighbor/node.def +++ b/templates/protocols/bgp/node.tag/neighbor/node.def @@ -1,5 +1,5 @@ tag: -type: txt +type: ipv4, ipv6 help: BGP neighbor val_help: ipv4; BGP neighbor IP address val_help: ipv6; BGP neighbor IPv6 address -- cgit v1.2.3 From 3222b91b8d84e30953e3def1525a78747f857eb8 Mon Sep 17 00:00:00 2001 From: Michael Date: Fri, 19 Nov 2010 09:23:26 -0800 Subject: Need to skip LAST node tag when configuring bgp node, but let all others through. --- templates/protocols/bgp/node.def | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'templates') diff --git a/templates/protocols/bgp/node.def b/templates/protocols/bgp/node.def index 3f55aab6..01f75f02 100644 --- a/templates/protocols/bgp/node.def +++ b/templates/protocols/bgp/node.def @@ -9,7 +9,6 @@ syntax:expression: $VAR(@) >= 1 && $VAR(@) <= 4294967294 ; \ end: -if [ "$COMMIT_SIBLING_POSITION" = "FIRST" ] || \ - [ "$COMMIT_SIBLING_POSITION" = "FIRSTLAST" ] ; then +if [ "$COMMIT_SIBLING_POSITION" != "LAST" ] ; then /opt/vyatta/sbin/vyatta-bgp.pl --main fi; -- cgit v1.2.3 From dee593c9ea2ffac2717e871a0419a79250b6e011 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Mon, 6 Dec 2010 16:57:26 -0800 Subject: Fix help text Bug 6111 Help text should not start with Set --- templates/protocols/ospfv3/area/node.tag/.filter-list/node.def | 2 +- templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def | 2 +- templates/protocols/rip/network-distance/node.tag/access-list/node.def | 2 +- templates/protocols/rip/timers/garbage-collection/node.def | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'templates') diff --git a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def index 791b3f5a..02729e7e 100644 --- a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def +++ b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.def @@ -1,2 +1,2 @@ type: txt -help: Set filter-list +help: Filter list diff --git a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def index 21fd7948..6bcaaf77 100644 --- a/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def +++ b/templates/protocols/ospfv3/area/node.tag/.filter-list/node.tag/node.def @@ -1,6 +1,6 @@ tag: type: txt -help: Set direction of filter (in|out) +help: Direction of filter (in|out) allowed: echo "in out" create:expression: "vtysh -c \"configure terminal\" \ -c \"router ospf6 \" \ diff --git a/templates/protocols/rip/network-distance/node.tag/access-list/node.def b/templates/protocols/rip/network-distance/node.tag/access-list/node.def index a7bc9a6f..3003e718 100644 --- a/templates/protocols/rip/network-distance/node.tag/access-list/node.def +++ b/templates/protocols/rip/network-distance/node.tag/access-list/node.def @@ -1,3 +1,3 @@ type: txt -help: Set access list +help: Access list commit:expression: exec "/opt/vyatta/sbin/vyatta_quagga_utils.pl --exists \"policy access-list $VAR(@)\" ";"access-list $VAR(@) doesn't exist" diff --git a/templates/protocols/rip/timers/garbage-collection/node.def b/templates/protocols/rip/timers/garbage-collection/node.def index b482ded1..a88d2324 100644 --- a/templates/protocols/rip/timers/garbage-collection/node.def +++ b/templates/protocols/rip/timers/garbage-collection/node.def @@ -1,6 +1,6 @@ type: u32 default: 120 -help: Set garbage collection timer +help: Garbage collection timer syntax:expression: $VAR(@) >= 5 && $VAR(@) <= 2147483647; \ "Garbage collection timer must be between 5 and 2147483647" val_help: u32:5-2147483647; Garbage colletion time (default 120) -- cgit v1.2.3