]> git.puffer.fish Git - mirror/frr.git/commitdiff
Merge pull request #14162 from opensourcerouting/feature/turn_on_nht_resolve_via_defa...
authorRuss White <russ@riw.us>
Wed, 13 Sep 2023 09:57:49 +0000 (05:57 -0400)
committerGitHub <noreply@github.com>
Wed, 13 Sep 2023 09:57:49 +0000 (05:57 -0400)
zebra: Turn on `nht resolve-via-default` by default for traditional profile

1  2 
doc/user/zebra.rst
zebra/zebra_vrf.c

Simple merge
index 0c063830d30534024c35a7679419432562ce9e9a,c13b3071e9f4fb24e3af13ec333460c0304e0762..25e65139894f447e46adf98a8dc658544c2e5db7
@@@ -371,8 -371,14 +371,14 @@@ struct zebra_vrf *zebra_vrf_alloc(struc
        zebra_vxlan_init_tables(zvrf);
        zebra_mpls_init_tables(zvrf);
        zebra_pw_init(zvrf);
 -      zvrf->table_id = RT_TABLE_MAIN;
 +      zvrf->table_id = rt_table_main_id;
        /* by default table ID is default one */
+       if (DFLT_ZEBRA_IP_NHT_RESOLVE_VIA_DEFAULT) {
+               zvrf->zebra_rnh_ip_default_route = true;
+               zvrf->zebra_rnh_ipv6_default_route = true;
+       }
        return zvrf;
  }