From 4bf0a85855f1a4b336a0de51fc1094bc2ccbe8f3 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 2 Sep 2019 15:34:53 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B4=D0=B5=D1=80=D0=B6=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=B0=D0=B3=D1=80=D0=B5=D0=B3=D0=B0=D1=86=D0=B8=D0=B8?= =?UTF-8?q?=20ipv4=20=D0=B0=D0=B4=D1=80=D0=B5=D1=81=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/extfilter-quagga/extfilter_quagga.conf | 2 ++ scripts/extfilter-quagga/extfilter_quagga.pl | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/extfilter-quagga/extfilter_quagga.conf b/scripts/extfilter-quagga/extfilter_quagga.conf index 0311acd..72e7785 100644 --- a/scripts/extfilter-quagga/extfilter_quagga.conf +++ b/scripts/extfilter-quagga/extfilter_quagga.conf @@ -34,3 +34,5 @@ quagga_config=/etc/quagga/bgpd.conf # путь к vtysh vtysh = /bin/vtysh +# агрегация отдельных ipv4 адресов в сети +ipv4_aggregate_prefix = 32 diff --git a/scripts/extfilter-quagga/extfilter_quagga.pl b/scripts/extfilter-quagga/extfilter_quagga.pl index de3acb3..959aea0 100755 --- a/scripts/extfilter-quagga/extfilter_quagga.pl +++ b/scripts/extfilter-quagga/extfilter_quagga.pl @@ -66,6 +66,8 @@ my $vtysh = $Config->{'BGP.vtysh'} || "/bin/vtysh"; my $route_to_null = (lc($Config->{'BGP.route_to_null'} || "true")) eq "true" ? 1 : 0; my $do_subnets = (lc($Config->{'BGP.do_subnets'} || "true")) eq "true" ? 1 : 0; +my $ipv4_agg_prefix = $Config->{'BGP.ipv4_aggregate_prefix'} || "32"; +$ipv4_agg_prefix = "/".$ipv4_agg_prefix if(index($ipv4_agg_prefix, "/") == -1); my $update_soft_quagga=1; @@ -124,8 +126,8 @@ next if($ip eq "0.0.0.0" || $ip eq "0000:0000:0000:0000:0000:0000:0000:0000"); if($ip =~ /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})/) { - $ip_cidr_null->add_any($ip) if($route_to_null); - $ip_cidr->add_any($ip); + $ip_cidr_null->add_any($ip.$ipv4_agg_prefix) if($route_to_null); + $ip_cidr->add_any($ip.$ipv4_agg_prefix); } else { $ip6_cidr_null->add_any($ip) if($route_to_null);