net/frr: fix route-maps with ipv6 prefix-lists (#1599)

* Update pkg-descr
* Update Makefile
* Update bgpd.conf
This commit is contained in:
Michael
2019-12-01 09:58:03 +01:00
committed by Fabian Franz BSc
parent 8dc2d35b36
commit a140582300
3 changed files with 10 additions and 4 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
PLUGIN_NAME= frr
PLUGIN_VERSION= 1.12
PLUGIN_VERSION= 1.13
PLUGIN_COMMENT= The FRRouting Protocol Suite
PLUGIN_DEPENDS= frr6 ruby
PLUGIN_MAINTAINER= franz.fabian.94@gmail.com
+4
View File
@@ -11,6 +11,10 @@ switching and routing, Internet access routers, and Internet peering.
Plugin Changelog
================
1.13
* Fix wrong match statement for IPv6 route-maps
1.12
* Add passive-interface to OSPFv3 (by Michael Muenz)
@@ -191,18 +191,20 @@ route-map {{ routemap.name }} {{ routemap.action }} {{ routemap.id }}
{% endif %}
{% endfor %}
{% endif %}
{% if routemap.set != '' %}
{% if routemap.set|default("") != '' and routemap.match|default("") != '' %}
set {{ routemap.set }}
{% endif %}
{% if routemap.match2|default("") != "" %}
{% for prefixlist in routemap.match2.split(",") %}
{% set prefixlist_data = helpers.getUUID(prefixlist) %}
{% if 'match2' in routemap and routemap.match2 != '' %}
{% if 'match2' in routemap and routemap.match2 != '' and ':' in prefixlist_data.network %}
match ipv6 address prefix-list {{ prefixlist_data.name }}
{% else %}
match ip address prefix-list {{ prefixlist_data.name }}
{% endif %}
{% endfor %}
{% endif %}
{% if routemap.set != '' %}
{% if routemap.set|default("") != '' and routemap.match2|default("") != '' %}
set {{ routemap.set }}
{% endif %}
{% endif %}