aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-03 21:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

hsm: remove shutdown command.

Browse Source 
We don't use it, and should shutdown when control fd goes away anyway.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-02-21 15:15:29 +10:30
parent ac1890136c
commit 19f3b68d28
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lightningd/hsm/hsm.c
View File

@@ -276,9 +276,6 @@ static struct io_plan *control_received_req(struct io_conn *conn,
control->out = pass_hsmfd_ecdh(conn, control, control->in,
&control->out_fd);
goto send_out;
case WIRE_HSMCTL_SHUTDOWN:
io_break(control);
return io_never(conn, control);
case WIRE_HSMCTL_INIT_RESPONSE:
case WIRE_HSMCTL_HSMFD_FD_RESPONSE:
@@ -301,6 +298,12 @@ static struct io_plan *control_init(struct io_conn *conn,
return recv_req(conn, control);
}
/* Exit when control fd closes. */
static void control_finish(struct io_conn *conn, struct conn_info *control)
{
io_break(control);
}
#ifndef TESTING
int main(int argc, char *argv[])
{
@@ -321,7 +324,9 @@ int main(int argc, char *argv[])
/* Stdout == status, stdin == requests */
status_setup(STDOUT_FILENO);
io_new_conn(control, STDIN_FILENO, control_init, control);
io_set_finish(io_new_conn(control, STDIN_FILENO, control_init, control),
control_finish, control);
io_loop(NULL, NULL);
tal_free(control);

3
lightningd/hsm/hsm_control_wire_csv
View File

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