Remove defunct multihome_ip_addrs config param

firedancer-io · Jan 29, 2025 · ebeee1a · ebeee1a
1 parent 4523550
commit ebeee1a
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 48 deletions.
diff --git a/src/app/fdctl/config.c b/src/app/fdctl/config.c
@@ -525,34 +525,6 @@ fdctl_cfg_from_env( int *      pargc,
     config->tiles.net.ip_addr = iface_ip;
     mac_address( config->tiles.net.interface, config->tiles.net.mac_addr );
 
-    /* support for multihomed hosts */
-    ulong multi_cnt = config->tiles.net.multihome_ip_addrs_cnt;
-    for( ulong j = 0; j < multi_cnt; ++j ) {
-      int success = fd_cstr_to_ip4_addr( config->tiles.net.multihome_ip_addrs[j],
-          &config->tiles.net.multihome_ip4_addrs[j] );
-      if( !success ) {
-        FD_LOG_ERR(( "configuration option [tiles.net.multihome_ip_addrs] "
-                     "specifies malformed IP address `%s`",
-                     config->tiles.net.multihome_ip_addrs[j] ));
-      }
-    }
-
-    /* look for duplicate addresses */
-    /* there's only a few, so do the O(n^2) comparison */
-    for( ulong j = 0; j < multi_cnt; ++j ) {
-      if( config->tiles.net.ip_addr == config->tiles.net.multihome_ip4_addrs[j] ) {
-        FD_LOG_ERR(( "configuration option [tiles.net.multihome_ip_addrs] "
-                     "specifies an address that matches [tiles.net.src_ip_addr]" ));
-      }
-      for( ulong k = j+1; k < multi_cnt; ++k ) {
-        if( config->tiles.net.multihome_ip4_addrs[j] == config->tiles.net.multihome_ip4_addrs[k] ) {
-          FD_LOG_ERR(( "configuration option [tiles.net.multihome_ip_addrs] "
-                       "specifies duplicate ip addresses `%s`",
-                       config->tiles.net.multihome_ip_addrs[j] ));
-        }
-      }
-    }
-
   }
 
   username_to_id( config );

diff --git a/src/app/fdctl/config.h b/src/app/fdctl/config.h
@@ -216,10 +216,6 @@ struct fdctl_config {
       uint xdp_aio_depth;
 
       uint send_buffer_size;
-
-      ulong multihome_ip_addrs_cnt; /* number of home ip addresses */
-      char  multihome_ip_addrs[FD_NET_MAX_SRC_ADDR][32];
-      uint  multihome_ip4_addrs[FD_NET_MAX_SRC_ADDR];
     } net;
 
     struct {

diff --git a/src/app/fdctl/config_parse.c b/src/app/fdctl/config_parse.c
@@ -290,7 +290,6 @@ fdctl_pod_to_cfg( config_t * config,
   CFG_POP      ( uint,   tiles.net.xdp_tx_queue_size                      );
   CFG_POP      ( uint,   tiles.net.xdp_aio_depth                          );
   CFG_POP      ( uint,   tiles.net.send_buffer_size                       );
-  CFG_POP_ARRAY( cstr,   tiles.net.multihome_ip_addrs                     );
 
   CFG_POP      ( ulong,  tiles.netlink.max_routes                         );
   CFG_POP      ( ulong,  tiles.netlink.max_neighbors                      );

diff --git a/src/app/fdctl/run/topos/fd_firedancer.c b/src/app/fdctl/run/topos/fd_firedancer.c
@@ -534,12 +534,6 @@ fd_topo_initialize( config_t * config ) {
       tile->net.repair_intake_listen_port      = config->tiles.repair.repair_intake_listen_port;
       tile->net.repair_serve_listen_port       = config->tiles.repair.repair_serve_listen_port;
 
-      /* multihome support */
-      ulong multi_cnt = tile->net.multihome_ip_addrs_cnt = config->tiles.net.multihome_ip_addrs_cnt;
-      for( ulong j = 0; j < multi_cnt; ++j ) {
-        tile->net.multihome_ip_addrs[j] = config->tiles.net.multihome_ip4_addrs[j];
-      }
-
     } else if( FD_UNLIKELY( !strcmp( tile->name, "netlnk" ) ) ) {
 
       /* already configured */

diff --git a/src/app/fdctl/run/topos/fd_frankendancer.c b/src/app/fdctl/run/topos/fd_frankendancer.c
@@ -363,11 +363,6 @@ fd_topo_initialize( config_t * config ) {
       tile->net.quic_transaction_listen_port   = config->tiles.quic.quic_transaction_listen_port;
       tile->net.legacy_transaction_listen_port = config->tiles.quic.regular_transaction_listen_port;
 
-      /* multihome support */
-      ulong multi_cnt = tile->net.multihome_ip_addrs_cnt = config->tiles.net.multihome_ip_addrs_cnt;
-      for( ulong j = 0; j < multi_cnt; ++j ) {
-        tile->net.multihome_ip_addrs[j] = config->tiles.net.multihome_ip4_addrs[j];
-      }
     } else if( FD_UNLIKELY( !strcmp( tile->name, "netlnk" ) ) ) {
 
       /* already configured */

diff --git a/src/disco/topo/fd_topo.h b/src/disco/topo/fd_topo.h
@@ -141,10 +141,6 @@ typedef struct {
       ushort gossip_listen_port;
       ushort repair_intake_listen_port;
       ushort repair_serve_listen_port;
-
-      /* multihoming support */
-      ulong multihome_ip_addrs_cnt;
-      uint  multihome_ip_addrs[FD_NET_MAX_SRC_ADDR];
     } net;
 
     struct {