Browse Source

hsm: rename the hsmctl_hsmfd_ecdh_response to hsmctl_hsmfd_fd_response

We want to use it for other HSM fd requests.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 8 years ago
parent
commit
ac1890136c
  1. 4
      lightningd/hsm/hsm.c
  2. 2
      lightningd/hsm/hsm_control_wire_csv
  3. 2
      lightningd/peer_control.c

4
lightningd/hsm/hsm.c

@ -254,7 +254,7 @@ static u8 *pass_hsmfd_ecdh(struct io_conn *conn,
io_new_conn(control, fds[0], ecdh_client, c);
*fd_to_pass = fds[1];
return towire_hsmctl_hsmfd_ecdh_response(control);
return towire_hsmctl_hsmfd_fd_response(control);
}
static struct io_plan *control_received_req(struct io_conn *conn,
@ -281,7 +281,7 @@ static struct io_plan *control_received_req(struct io_conn *conn,
return io_never(conn, control);
case WIRE_HSMCTL_INIT_RESPONSE:
case WIRE_HSMCTL_HSMFD_ECDH_RESPONSE:
case WIRE_HSMCTL_HSMFD_FD_RESPONSE:
break;
}

2
lightningd/hsm/hsm_control_wire_csv

@ -10,7 +10,7 @@ hsmctl_hsmfd_ecdh,3
hsmctl_hsmfd_ecdh,0,unique_id,8
# No message, just an fd.
hsmctl_hsmfd_ecdh_response,103
hsmctl_hsmfd_fd_response,103
# Shutdown just results in an exit.
hsmctl_shutdown,4

2
lightningd/peer_control.c

@ -136,7 +136,7 @@ static void peer_got_hsmfd(struct subdaemon *hsm, const u8 *msg,
{
const u8 *req;
if (!fromwire_hsmctl_hsmfd_ecdh_response(msg, NULL)) {
if (!fromwire_hsmctl_hsmfd_fd_response(msg, NULL)) {
log_unusual(peer->ld->log, "Malformed hsmfd response: %s",
tal_hex(peer, msg));
goto error;

Loading…
Cancel
Save