lightningd: remove announce-addr-dns flag.

Signed-off-by: Rusty Russell <[email protected]>
Changelog-Removed: Config: `announce-addr-dns` (deprecated v23.08, disabled in v24.11).

Author: rustyrussell

doc/developers-guide/deprecations.md

@@ -7,7 +7,6 @@ hidden: false
 
 | Name                                 | Type               | First Deprecated | Last Supported | Description                                                                                                                                                                     |
 |--------------------------------------|--------------------|------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| announce-addr-dns                    | Config             | v23.08           | v24.08         | Use `bind-addr=dns:` to specify DNS announcements on a per-address basis                                                                                                        |
 | rest-port.clnrest-prefix             | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-port` to `clnrest-port` (added in v23.11)                                                                                              |
 | rest-protocol.clnrest-prefix         | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-protocol` to `clnrest-protocol` (added in v23.11)                                                                                      |
 | rest-host.clnrest-prefix             | Config             | v23.11           | v24.11         | Autodetect where we need to rename `rest-host` to `clnrest-host` (added in v23.11)                                                                                              |

lightningd/lightningd.c

@@ -245,10 +245,6 @@ static struct lightningd *new_lightningd(const tal_t *ctx)
 	ld->proposed_wireaddr = tal_arr(ld, struct wireaddr_internal, 0);
 	ld->proposed_listen_announce = tal_arr(ld, enum addr_listen_announce, 0);
 
-	/*~ The network is not yet ready for DNS names inside node_announcements,
-	 * so we disable this by default for now. */
-	ld->announce_dns = false;
-
 	ld->lease_rates = NULL;
 	ld->node_announcement = NULL;
 	ld->discovered_ip_v4 = NULL;

lightningd/lightningd.h

@@ -274,9 +274,6 @@ struct lightningd {
 	/* If they force db upgrade on or off this is set. */
 	bool *db_upgrade_ok;
 
-	/* Announce names in config as DNS records (recently BOLT 7 addition) */
-	bool announce_dns;
-
 	/* Indexes used by all the wait infra */
 	struct indexes indexes[NUM_WAIT_SUBSYSTEM];
 

lightningd/options.c

@@ -231,20 +231,10 @@ static char *opt_add_addr_withtype(const char *arg,
 	char const *err_msg;
 	struct wireaddr_internal wi;
 	bool dns_lookup_ok;
-	char *address;
-	u16 port;
 
 	assert(arg != NULL);
 	dns_lookup_ok = !ld->always_use_proxy && ld->config.use_dns;
 
-	/* Deprecated announce-addr-dns: autodetect DNS addresses. */
-	if (ld->announce_dns && (ala == ADDR_ANNOUNCE)
-	    && separate_address_and_port(tmpctx, arg, &address, &port)
-	    && is_dnsaddr(address)) {
-		log_unusual(ld->log, "Adding dns prefix to %s!", arg);
-		arg = tal_fmt(tmpctx, "dns:%s", arg);
-	}
-
 	err_msg = parse_wireaddr_internal(tmpctx, arg, ld->portnum,
 					  dns_lookup_ok, &wi);
 	if (err_msg)
@@ -1489,10 +1479,6 @@ static void register_opts(struct lightningd *ld)
 	opt_register_early_noarg("--experimental-anchors",
 				 opt_set_anchor_zero_fee_htlc_tx, ld,
 				 opt_hidden);
-	clnopt_witharg("--announce-addr-dns", OPT_EARLY|OPT_SHOWBOOL,
-		       opt_set_bool_arg, opt_show_bool,
-		       &ld->announce_dns,
-		       opt_hidden);
 
 	clnopt_noarg("--help|-h", OPT_EXITS,
 		     opt_lightningd_usage, ld, "Print this message.");