Skip to content

net/frr: Add per-neighbor local-as no-prepend/replace-as options #5688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
clarkchentw wants to merge 1 commit into
base: master
Choose a base branch
from
Open

net/frr: Add per-neighbor local-as no-prepend/replace-as options #5688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion net/frr/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PLUGIN_NAME= frr
PLUGIN_VERSION= 1.55
PLUGIN_VERSION= 1.56
PLUGIN_COMMENT= The FRRouting Protocol Suite
PLUGIN_DEPENDS= frr10-pythontools
PLUGIN_MAINTAINER= ad@opnsense.org
Expand Down
4 changes: 4 additions & 0 deletions net/frr/pkg-descr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ switching and routing, Internet access routers, and Internet peering.
Plugin Changelog
================

1.56

* BGP: Add per-neighbor local-as no-prepend/replace-as options (contributed by clarkchentw)

1.55

* BGP: Write neighbor remote-as only when set (contributed by juan-ferrer-toribio)
Expand Down
10 changes: 10 additions & 0 deletions net/frr/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/dialogEditBGPNeighbor.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,16 @@
<visible>false</visible>
</grid_view>
</field>
<field>
<id>neighbor.localasoptions</id>
<label>Local AS Options</label>
<type>dropdown</type>
<advanced>true</advanced>
<help>Optional modifiers for the neighbor local-as command. "No-Prepend" prevents prepending the Local AS to received AS-Paths. "Replace-AS" causes only the Local AS to be prepended to outbound updates.</help>
<grid_view>
<visible>false</visible>
</grid_view>
</field>
<field>
<id>neighbor.password</id>
<label>BGP MD5 Password</label>
Expand Down
15 changes: 15 additions & 0 deletions net/frr/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,22 @@
<localas type="IntegerField">
<MinimumValue>1</MinimumValue>
<MaximumValue>4294967295</MaximumValue>
<Constraints>
<check001>
<ValidationMessage>A Local AS is required when Local AS Options are set.</ValidationMessage>
<type>DependConstraint</type>
<addFields>
<field1>localasoptions</field1>
</addFields>
</check001>
</Constraints>
</localas>
<localasoptions type="OptionField">
<OptionValues>
<noprepend value="no-prepend">No-Prepend</noprepend>
<replaceas value="no-prepend replace-as">No-Prepend Replace-AS</replaceas>
</OptionValues>
</localasoptions>
<password type="TextField"/>
<weight type="IntegerField">
<MinimumValue>0</MinimumValue>
Expand Down
2 changes: 1 addition & 1 deletion net/frr/src/opnsense/service/templates/OPNsense/Quagga/Config/bgpd.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ router bgp {{ OPNsense.quagga.bgp.asnumber }}
neighbor {{ neighbor.address }} remote-as {{ neighbor.remoteas }}
{% endif %}
{% if 'localas' in neighbor and neighbor.localas != '' %}
neighbor {{ neighbor.address }} local-as {{ neighbor.localas }}
neighbor {{ neighbor.address }} local-as {{ neighbor.localas }}{% if neighbor.localasoptions|default('') %} {{ neighbor.localasoptions }}{% endif %}
{% endif %}
{% if 'description' in neighbor and neighbor.description != '' %}
neighbor {{ neighbor.address }} description {{ neighbor.description }}
Expand Down