protocol: pkt_reconnect becomes pkt_init, and always send.

Make this always the first packet after auth.  That means there's no
reliance on whether a node remembers an aborted connection.

It also gives us a place to put version bits.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

Author: rustyrussell

daemon/packets.c

@@ -236,12 +236,12 @@ Pkt *pkt_err(struct peer *peer, const char *msg, ...)
 	return make_pkt(peer, PKT__PKT_ERROR, e);
 }
 
-Pkt *pkt_reconnect(struct peer *peer, u64 ack)
+Pkt *pkt_init(struct peer *peer, u64 ack)
 {
-	Reconnect *r = tal(peer, Reconnect);
-	reconnect__init(r);
-	r->ack = ack;
-	return make_pkt(peer, PKT__PKT_RECONNECT, r);
+	Init *i = tal(peer, Init);
+	init__init(i);
+	i->ack = ack;
+	return make_pkt(peer, PKT__PKT_INIT, i);
 }
 
 void queue_pkt_err(struct peer *peer, Pkt *err)

daemon/packets.h

@@ -26,7 +26,7 @@ void queue_pkt_close_shutdown(struct peer *peer);
 void queue_pkt_close_signature(struct peer *peer);
 
 Pkt *pkt_err(struct peer *peer, const char *msg, ...);
-Pkt *pkt_reconnect(struct peer *peer, u64 ack);
+Pkt *pkt_init(struct peer *peer, u64 ack);
 void queue_pkt_err(struct peer *peer, Pkt *err);
 Pkt *pkt_err_unexpected(struct peer *peer, const Pkt *pkt);
 

daemon/peer.c

@@ -2091,6 +2091,86 @@ static void peer_has_connected(struct peer *peer)
 	}
 }
 
+static struct io_plan *init_pkt_in(struct io_conn *conn, struct peer *peer)
+{
+	if (peer->inpkt->pkt_case != PKT__PKT_INIT) {
+		peer_received_unexpected_pkt(peer, peer->inpkt, __func__);
+		return pkt_out(conn, peer);
+	}
+
+	/* They might have missed the error, tell them before hanging up */
+	if (state_is_error(peer->state)) {
+		queue_pkt_err(peer, pkt_err(peer, "In error state %s",
+					    state_name(peer->state)));
+		return pkt_out(conn, peer);
+	}
+	
+	/* Send any packets they missed. */
+	retransmit_pkts(peer, peer->inpkt->init->ack);
+
+	/* We let the conversation go this far in case they missed the
+	 * close packets.  But now we can close if we're done. */
+	if (!state_can_io(peer->state)) {
+		log_debug(peer->log, "State %s, closing immediately",
+			  state_name(peer->state));
+		return pkt_out(conn, peer);
+	}
+
+	/* Back into normal mode. */
+	peer_has_connected(peer);
+	return io_duplex(conn,
+			 peer_read_packet(conn, peer, pkt_in),
+			 pkt_out(conn, peer));
+}
+
+static struct io_plan *read_init_pkt(struct io_conn *conn,
+					  struct peer *peer)
+{
+	return peer_read_packet(conn, peer, init_pkt_in);
+}
+
+static u64 peer_commitsigs_received(struct peer *peer)
+{
+	return peer->their_commitsigs;
+}
+
+static u64 peer_revocations_received(struct peer *peer)
+{
+	/* How many preimages we've received. */
+	return -peer->their_preimages.min_index;
+}
+
+static struct io_plan *peer_send_init(struct io_conn *conn, struct peer *peer)
+{
+	u64 sigs, revokes, shutdown, closing;
+
+	sigs = peer_commitsigs_received(peer);
+	revokes = peer_revocations_received(peer);
+	shutdown = peer->closing.their_script ? 1 : 0;
+	closing = peer->closing.sigs_in;
+	log_debug(peer->log,
+		  "Init with ack %"PRIu64" sigs + %"PRIu64" revokes"
+		  " + %"PRIu64" shutdown + %"PRIu64" closing",
+		  sigs, revokes, shutdown, closing);
+
+	/* BOLT #2:
+	 *
+	 * A node reconnecting after receiving or sending an `open_channel`
+	 * message SHOULD send a `reconnect` message on the new connection
+	 * immediately after it has validated the `authenticate` message. */
+
+	/* BOLT #2:
+	 *
+	 * A node MUST set the `ack` field in the `reconnect` message to the
+	 * the sum of previously-processed messages of types
+	 * `open_commit_sig`, `update_commit`, `update_revocation`,
+	 * `close_shutdown` and `close_signature`. */
+	return peer_write_packet(conn, peer,
+				 pkt_init(peer, sigs + revokes
+					  + shutdown + closing),
+				 read_init_pkt);
+}
+
 /* Crypto is on, we are live. */
 static struct io_plan *peer_crypto_on(struct io_conn *conn, struct peer *peer)
 {
@@ -2107,10 +2187,7 @@ static struct io_plan *peer_crypto_on(struct io_conn *conn, struct peer *peer)
 
 	state_event(peer, peer->local.offer_anchor, NULL);
 
-	peer_has_connected(peer);
-	return io_duplex(conn,
-			 peer_read_packet(conn, peer, pkt_in),
-			 pkt_out(conn, peer));
+	return peer_send_init(conn,peer);
 }
 
 static void destroy_peer(struct peer *peer)
@@ -2484,17 +2561,6 @@ static bool peer_first_connected(struct peer *peer,
 	return true;
 }
 
-static u64 peer_commitsigs_received(struct peer *peer)
-{
-	return peer->their_commitsigs;
-}
-
-static u64 peer_revocations_received(struct peer *peer)
-{
-	/* How many preimages we've received. */
-	return -peer->their_preimages.min_index;
-}
-
 static void htlc_destroy(struct htlc *htlc)
 {
 	if (!htlc_map_del(&htlc->peer->htlcs, htlc))
@@ -2540,86 +2606,22 @@ struct htlc *peer_new_htlc(struct peer *peer,
 	return h;
 }
 
-
-static struct io_plan *reconnect_pkt_in(struct io_conn *conn, struct peer *peer)
-{
-	if (peer->inpkt->pkt_case != PKT__PKT_RECONNECT) {
-		peer_received_unexpected_pkt(peer, peer->inpkt, __func__);
-		return pkt_out(conn, peer);
-	}
-
-	/* We need to eliminate queue now. */
-	clear_output_queue(peer);
-
-	/* They might have missed the error, tell them before hanging up */
-	if (state_is_error(peer->state)) {
-		queue_pkt_err(peer, pkt_err(peer, "In error state %s",
-					    state_name(peer->state)));
-		return pkt_out(conn, peer);
-	}
-	
-	/* Send any packets they missed. */
-	retransmit_pkts(peer, peer->inpkt->reconnect->ack);
-
-	/* We let the conversation go this far in case they missed the
-	 * close packets.  But now we can close if we're done. */
-	if (!state_can_io(peer->state)) {
-		log_debug(peer->log, "State %s, closing immediately",
-			  state_name(peer->state));
-		return pkt_out(conn, peer);
-	}
-
-	/* Back into normal mode. */
-	peer_has_connected(peer);
-	return io_duplex(conn,
-			 peer_read_packet(conn, peer, pkt_in),
-			 pkt_out(conn, peer));
-}
-
-static struct io_plan *read_reconnect_pkt(struct io_conn *conn,
-					  struct peer *peer)
-{
-	return peer_read_packet(conn, peer, reconnect_pkt_in);
-}
-
 static struct io_plan *crypto_on_reconnect(struct io_conn *conn,
 					   struct lightningd_state *dstate,
 					   struct io_data *iod,
 					   const struct pubkey *id,
 					   struct peer *peer,
 					   bool we_connected)
 {
-	u64 sigs, revokes, shutdown, closing;
-
 	/* Setup peer->conn and peer->io_data */
 	if (!peer_reconnected(peer, conn, SOCK_STREAM, IPPROTO_TCP,
 			      iod, id, we_connected))
 		return io_close(conn);
 
-	sigs = peer_commitsigs_received(peer);
-	revokes = peer_revocations_received(peer);
-	shutdown = peer->closing.their_script ? 1 : 0;
-	closing = peer->closing.sigs_in;
-	log_debug(peer->log,
-		  "Reconnecting with ack %"PRIu64" sigs + %"PRIu64" revokes"
-		  " + %"PRIu64" shutdown + %"PRIu64" closing",
-		  sigs, revokes, shutdown, closing);
-	/* BOLT #2:
-	 *
-	 * A node reconnecting after receiving or sending an `open_channel`
-	 * message SHOULD send a `reconnect` message on the new connection
-	 * immediately after it has validated the `authenticate` message. */
+	/* We need to eliminate queue now. */
+	clear_output_queue(peer);
 
-	/* BOLT #2:
-	 *
-	 * A node MUST set the `ack` field in the `reconnect` message to the
-	 * the sum of previously-processed messages of types
-	 * `open_commit_sig`, `update_commit`, `update_revocation`,
-	 * `close_shutdown` and `close_signature`. */
-	return peer_write_packet(conn, peer,
-				 pkt_reconnect(peer, sigs + revokes
-					       + shutdown + closing),
-				 read_reconnect_pkt);
+	return peer_send_init(conn, peer);
 }
 
 static struct io_plan *crypto_on_reconnect_in(struct io_conn *conn,

lightning.pb-c.c

@@ -308,47 +308,47 @@ void   authenticate__free_unpacked
   assert(message->base.descriptor == &authenticate__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
-void   reconnect__init
-                     (Reconnect         *message)
+void   init__init
+                     (Init         *message)
 {
-  static Reconnect init_value = RECONNECT__INIT;
+  static Init init_value = INIT__INIT;
   *message = init_value;
 }
-size_t reconnect__get_packed_size
-                     (const Reconnect *message)
+size_t init__get_packed_size
+                     (const Init *message)
 {
-  assert(message->base.descriptor == &reconnect__descriptor);
+  assert(message->base.descriptor == &init__descriptor);
   return protobuf_c_message_get_packed_size ((const ProtobufCMessage*)(message));
 }
-size_t reconnect__pack
-                     (const Reconnect *message,
+size_t init__pack
+                     (const Init *message,
                       uint8_t       *out)
 {
-  assert(message->base.descriptor == &reconnect__descriptor);
+  assert(message->base.descriptor == &init__descriptor);
   return protobuf_c_message_pack ((const ProtobufCMessage*)message, out);
 }
-size_t reconnect__pack_to_buffer
-                     (const Reconnect *message,
+size_t init__pack_to_buffer
+                     (const Init *message,
                       ProtobufCBuffer *buffer)
 {
-  assert(message->base.descriptor == &reconnect__descriptor);
+  assert(message->base.descriptor == &init__descriptor);
   return protobuf_c_message_pack_to_buffer ((const ProtobufCMessage*)message, buffer);
 }
-Reconnect *
-       reconnect__unpack
+Init *
+       init__unpack
                      (ProtobufCAllocator  *allocator,
                       size_t               len,
                       const uint8_t       *data)
 {
-  return (Reconnect *)
-     protobuf_c_message_unpack (&reconnect__descriptor,
+  return (Init *)
+     protobuf_c_message_unpack (&init__descriptor,
                                 allocator, len, data);
 }
-void   reconnect__free_unpacked
-                     (Reconnect *message,
+void   init__free_unpacked
+                     (Init *message,
                       ProtobufCAllocator *allocator)
 {
-  assert(message->base.descriptor == &reconnect__descriptor);
+  assert(message->base.descriptor == &init__descriptor);
   protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator);
 }
 void   open_channel__init
@@ -1644,42 +1644,42 @@ const ProtobufCMessageDescriptor authenticate__descriptor =
   (ProtobufCMessageInit) authenticate__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
-static const ProtobufCFieldDescriptor reconnect__field_descriptors[1] =
+static const ProtobufCFieldDescriptor init__field_descriptors[1] =
 {
   {
     "ack",
     1,
     PROTOBUF_C_LABEL_REQUIRED,
     PROTOBUF_C_TYPE_UINT64,
     0,   /* quantifier_offset */
-    offsetof(Reconnect, ack),
+    offsetof(Init, ack),
     NULL,
     NULL,
     0,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
 };
-static const unsigned reconnect__field_indices_by_name[] = {
+static const unsigned init__field_indices_by_name[] = {
   0,   /* field[0] = ack */
 };
-static const ProtobufCIntRange reconnect__number_ranges[1 + 1] =
+static const ProtobufCIntRange init__number_ranges[1 + 1] =
 {
   { 1, 0 },
   { 0, 1 }
 };
-const ProtobufCMessageDescriptor reconnect__descriptor =
+const ProtobufCMessageDescriptor init__descriptor =
 {
   PROTOBUF_C__MESSAGE_DESCRIPTOR_MAGIC,
-  "reconnect",
-  "Reconnect",
-  "Reconnect",
+  "init",
+  "Init",
+  "Init",
   "",
-  sizeof(Reconnect),
+  sizeof(Init),
   1,
-  reconnect__field_descriptors,
-  reconnect__field_indices_by_name,
-  1,  reconnect__number_ranges,
-  (ProtobufCMessageInit) reconnect__init,
+  init__field_descriptors,
+  init__field_indices_by_name,
+  1,  init__number_ranges,
+  (ProtobufCMessageInit) init__init,
   NULL,NULL,NULL    /* reserved[123] */
 };
 static const ProtobufCEnumValue open_channel__anchor_offer__enum_values_by_number[2] =
@@ -2840,13 +2840,13 @@ static const ProtobufCFieldDescriptor pkt__field_descriptors[15] =
     0,NULL,NULL    /* reserved1,reserved2, etc */
   },
   {
-    "reconnect",
+    "init",
     51,
     PROTOBUF_C_LABEL_OPTIONAL,
     PROTOBUF_C_TYPE_MESSAGE,
     offsetof(Pkt, pkt_case),
-    offsetof(Pkt, reconnect),
-    &reconnect__descriptor,
+    offsetof(Pkt, init),
+    &init__descriptor,
     NULL,
     0 | PROTOBUF_C_FIELD_FLAG_ONEOF,             /* flags */
     0,NULL,NULL    /* reserved1,reserved2, etc */
@@ -2857,11 +2857,11 @@ static const unsigned pkt__field_indices_by_name[] = {
   10,   /* field[10] = close_shutdown */
   11,   /* field[11] = close_signature */
   12,   /* field[12] = error */
+  14,   /* field[14] = init */
   6,   /* field[6] = open */
   7,   /* field[7] = open_anchor */
   8,   /* field[8] = open_commit_sig */
   9,   /* field[9] = open_complete */
-  14,   /* field[14] = reconnect */
   0,   /* field[0] = update_add_htlc */
   4,   /* field[4] = update_commit */
   2,   /* field[2] = update_fail_htlc */