chore: use EXPERIMENTAL for BOLT1 remote_addr #917

Author: m-schmoock

connectd/peer_exchange_initmsg.c

@@ -41,6 +41,7 @@ static bool contains_common_chain(struct bitcoin_blkid *chains)
 /* Here in case we need to read another message. */
 static struct io_plan *read_init(struct io_conn *conn, struct early_peer *peer);
 
+#if EXPERIMENTAL_FEATURES /* BOLT1 remote_addr #917 */
 struct remote_addr_any {
 	u8 type; /* ipv4:1  ipv6:2 */
 }__attribute__((packed));
@@ -56,6 +57,7 @@ struct remote_addr_ipv6 {
 	u8 addr[16];
 	u16 port;
 }__attribute__((packed));
+#endif
 
 static struct io_plan *peer_init_received(struct io_conn *conn,
 					  struct early_peer *peer)
@@ -105,6 +107,7 @@ static struct io_plan *peer_init_received(struct io_conn *conn,
 
 	/* fetch optional tlv `remote_addr` */
 	remote_addr = NULL;
+#if EXPERIMENTAL_FEATURES /* BOLT1 remote_addr #917 */
 	/* BOLT-remote-address #1:
 	 * The receiving node:
 	 * ...
@@ -124,6 +127,7 @@ static struct io_plan *peer_init_received(struct io_conn *conn,
 			break;
 		}
 	}
+#endif
 
 	/* The globalfeatures field is now unused, but there was a
 	 * window where it was: combine the two. */
@@ -221,6 +225,7 @@ struct io_plan *peer_exchange_initmsg(struct io_conn *conn,
 
 	/* set optional tlv `remote_addr` on incoming IP connections */
 	tlvs->remote_addr = NULL;
+#if EXPERIMENTAL_FEATURES /* BOLT1 remote_addr #917 */
 	/* BOLT-remote-address #1:
 	 * The sending node:
 	 * ...
@@ -244,6 +249,7 @@ struct io_plan *peer_exchange_initmsg(struct io_conn *conn,
 			break;
 		}
 	}
+#endif
 
 	/* Initially, there were two sets of feature bits: global and local.
 	 * Local affected peer nodes only, global affected everyone.  Both were