Jerry/bird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Config: Dropped the ipv4:netmask4 syntax for IPv4 prefixes.

Browse source
This commit is contained in:
Jan Maria Matejka 2018-03-06 16:03:35 +01:00
parent d0f47327f8
commit 0575c7db72
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/confbase.Y
View file

@ -177,10 +177,6 @@ pxlen4:
if ($2 > IP4_MAX_PREFIX_LENGTH) cf_error("Invalid prefix length %u", $2); if ($2 > IP4_MAX_PREFIX_LENGTH) cf_error("Invalid prefix length %u", $2);
$$ = $2; $$ = $2;
} }
| ':' IP4 {
$$ = ip4_masklen($2);
if ($$ == 255) cf_error("Invalid netmask %I4", $2);
}
; ;
net_ip4_: IP4 pxlen4 net_ip4_: IP4 pxlen4

3
doc/bird.sgml
View file

@ -1234,8 +1234,7 @@ foot).
operator <cf/.type/. The type may be: operator <cf/.type/. The type may be:
<cf/NET_IP4/ and <cf/NET_IP6/ prefixes hold an IP prefix. The literals <cf/NET_IP4/ and <cf/NET_IP6/ prefixes hold an IP prefix. The literals
are written as <cf><m/ipaddress//<m/pxlen/</cf>, are written as <cf><m/ipaddress//<m/pxlen/</cf>. There are two special
or <cf><m>ipaddress</m>/<m>netmask</m></cf>. There are two special
operators on these: <cf/.ip/ which extracts the IP address from the operators on these: <cf/.ip/ which extracts the IP address from the
pair, and <cf/.len/, which separates prefix length from the pair. pair, and <cf/.len/, which separates prefix length from the pair.
So <cf>1.2.0.0/16.len = 16</cf> is true. So <cf>1.2.0.0/16.len = 16</cf> is true.

6
filter/test.conf2
View file

@ -76,8 +76,8 @@ protocol static {
route 62.168.0.0/25 reject; route 62.168.0.0/25 reject;
route 1.2.3.4/32 via 195.113.31.124; route 1.2.3.4/32 via 195.113.31.124;
route 10.0.0.0/8 reject; route 10.0.0.0/8 reject;
route 10.1.1.0:255.255.255.0 via 62.168.0.3; route 10.1.1.0/24 via 62.168.0.3;
route 10.1.2.0:255.255.255.0 via 62.168.0.3; route 10.1.2.0/24 via 62.168.0.3;
route 10.1.3.0:255.255.255.0 via 62.168.0.4; route 10.1.3.0/24 via 62.168.0.4;
route 10.2.0.0/24 via "arc0"; route 10.2.0.0/24 via "arc0";
} }