diff options
| author | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-03-29 15:31:04 +0200 |
|---|---|---|
| committer | Ondrej Zajicek (work) <santiago@crfreenet.org> | 2017-03-29 15:31:04 +0200 |
| commit | 6fe11c994151344c38d1b080c3f2e1280b4b2448 (patch) | |
| tree | 79cb1e71989bd11f4107f0be0daf8331977bb5e4 /proto/bgp/config.Y | |
| parent | c49e4a65657e9abff1b94cbfdc7686efe7376a7a (diff) | |
BGP: Simplify igp table options
Diffstat (limited to 'proto/bgp/config.Y')
| -rw-r--r-- | proto/bgp/config.Y | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/proto/bgp/config.Y b/proto/bgp/config.Y index 1678256b..e2dc4053 100644 --- a/proto/bgp/config.Y +++ b/proto/bgp/config.Y @@ -179,11 +179,16 @@ bgp_channel_item: | ADD PATHS TX { BGP_CC->add_path = BGP_ADD_PATH_TX; } | ADD PATHS bool { BGP_CC->add_path = $3 ? BGP_ADD_PATH_FULL : 0; } | IGP TABLE rtable { - if (bgp_cc_is_ipv4(BGP_CC)) BGP_CC->igp_table_ip4 = $3; - if (bgp_cc_is_ipv6(BGP_CC)) BGP_CC->igp_table_ip6 = $3; + if (BGP_CC->desc->no_igp) + cf_error("IGP table not allowed here"); + + if ($3->addr_type == NET_IP4) + BGP_CC->igp_table_ip4 = $3; + else if ($3->addr_type == NET_IP6) + BGP_CC->igp_table_ip6 = $3; + else + cf_error("Mismatched IGP table type"); } - | IGP TABLE IPV4 rtable { BGP_CC->igp_table_ip4 = $4; } - | IGP TABLE IPV6 rtable { BGP_CC->igp_table_ip6 = $4; } ; bgp_channel_opts: |