Project

General

Profile

Bug #15771 ยป frr_rpki.patch

Jim Pingle, 10/09/2024 04:43 PM

View differences:

a/usr/local/pkg/frr.inc โ†’ b/usr/local/pkg/frr.inc
387 387
               }
388 388
       }
389 389
       /* BGP RPKI */
390
       if (config_get_path("installedpackages/{$config_key}/config/0/enablerpki")) {
390
       if (config_get_path("installedpackages/frrbgp/config/0/enablerpki") == "on") {
391 391
               $frr_daemon_modules['bgpd'] .= ' -M rpki';
392 392
       }
393 393

  
a/usr/local/pkg/frr/frr_bgp_rpki_cache_servers.xml โ†’ b/usr/local/pkg/frr/frr_bgp_rpki_cache_servers.xml
137 137
                       <description>Local path that includes the public key file of the router</description>
138 138
                       <type>input</type>
139 139
               </field>
140
               <field>
141
                       <fielddescr>Known Hosts Path</fielddescr>
142
                       <fieldname>knownhostspath</fieldname>
143
                       <description>Local path that includes the known hosts file</description>
144
                       <type>input</type>
145
               </field>
146 140
       </fields>
147 141
       <custom_delete_php_command>
148 142
               frr_generate_config();
a/usr/local/pkg/frr/inc/frr_bgp.inc โ†’ b/usr/local/pkg/frr/inc/frr_bgp.inc
848 848
       if (!empty($frr_bgp_rpki_cs)) {
849 849
               foreach ($frr_bgp_rpki_cs as $cs) {
850 850
                       $rpki_config .= " rpki cache {$cs['cacheserver']} {$cs['port']}";
851
                       foreach (array("username", "privkeypath", "pubkeypath", "knownhostspath") as $key) {
851
                       foreach (array("username", "privkeypath", "pubkeypath") as $key) {
852 852
                               if (empty($cs[$key])) {
853 853
                                       continue;
854 854
                               }
    (1-1/1)