diff options
| author | Robert Bays <robert@vyatta.com> | 2010-11-18 17:50:45 -0800 |
|---|---|---|
| committer | Robert Bays <robert@vyatta.com> | 2010-11-18 17:50:45 -0800 |
| commit | c16eed83ace66660a643273b052ebaa537afd373 (patch) | |
| tree | c36c722a981ab392dc871663611eb1f1cdd199b4 | |
| parent | 64ae8ae1477474ca94c432a6664a73cba220fd36 (diff) | |
| download | vyatta-cfg-quagga-c16eed83ace66660a643273b052ebaa537afd373.tar.gz vyatta-cfg-quagga-c16eed83ace66660a643273b052ebaa537afd373.zip | |
fix bug 6430
| -rwxr-xr-x | scripts/bgp/vyatta-bgp.pl | 13 | ||||
| -rw-r--r-- | templates/protocols/bgp/node.tag/neighbor/node.def | 2 |
2 files changed, 11 insertions, 4 deletions
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 |