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

connectd: do dev_disconnect logic.

Browse Source 
As connectd handles more packets itself, or diverts them to/from gossipd,
it's the only place we can implement the dev_disconnect logic.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-01-08 23:55:29 +10:30
parent 9c0bb444b7
commit 7a514112ec
17 changed files with 71 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lightningd/connect_control.c
View File

@@ -360,7 +360,13 @@ int connectd_init(struct lightningd *ld)
ld->connectd = new_global_subd(ld, "lightning_connectd",
connectd_wire_name, connectd_msg,
take(&hsmfd), take(&fds[1]), NULL);
take(&hsmfd), take(&fds[1]),
#if DEVELOPER
/* Not take(): we share it */
ld->dev_disconnect_fd >= 0 ?
&ld->dev_disconnect_fd : NULL,
#endif
NULL);
if (!ld->connectd)
err(1, "Could not subdaemon connectd");
@@ -385,7 +391,8 @@ int connectd_init(struct lightningd *ld)
ld->config.use_v3_autotor,
ld->config.connection_timeout_secs,
websocket_helper_path,
ld->websocket_port);
ld->websocket_port,
IFDEV(ld->dev_disconnect_fd >= 0, false));
subd_req(ld->connectd, ld->connectd, take(msg), -1, 0,
connect_init_done, NULL);

14
lightningd/subd.c
View File

@@ -188,7 +188,7 @@ static void close_taken_fds(va_list *ap)
/* We use sockets, not pipes, because fds are bidir. */
static int subd(const char *path, const char *name,
const char *debug_subdaemon,
int *msgfd, int dev_disconnect_fd,
int *msgfd,
bool io_logging,
va_list *ap)
{
@@ -212,7 +212,7 @@ static int subd(const char *path, const char *name,
if (childpid == 0) {
size_t num_args;
char *args[] = { NULL, NULL, NULL, NULL, NULL };
char *args[] = { NULL, NULL, NULL, NULL };
int **fds = tal_arr(tmpctx, int *, 3);
int stdoutfd = STDOUT_FILENO, stderrfd = STDERR_FILENO;
@@ -230,10 +230,6 @@ static int subd(const char *path, const char *name,
tal_arr_expand(&fds, fd);
}
/* If we have a dev_disconnect_fd, add it after. */
if (dev_disconnect_fd != -1)
tal_arr_expand(&fds, &dev_disconnect_fd);
/* Finally, the fd to report exec errors on */
tal_arr_expand(&fds, &execfail[1]);
@@ -248,8 +244,6 @@ static int subd(const char *path, const char *name,
if (io_logging)
args[num_args++] = "--log-io";
#if DEVELOPER
if (dev_disconnect_fd != -1)
args[num_args++] = tal_fmt(NULL, "--dev-disconnect=%i", dev_disconnect_fd);
if (debug_subdaemon && strends(name, debug_subdaemon))
args[num_args++] = "--debugger";
#endif
@@ -700,7 +694,6 @@ static struct subd *new_subd(struct lightningd *ld,
struct subd *sd = tal(ld, struct subd);
int msg_fd;
const char *debug_subd = NULL;
int disconnect_fd = -1;
const char *shortname;
assert(name != NULL);
@@ -720,13 +713,12 @@ static struct subd *new_subd(struct lightningd *ld,
#if DEVELOPER
debug_subd = ld->dev_debug_subprocess;
disconnect_fd = ld->dev_disconnect_fd;
#endif /* DEVELOPER */
const char *path = subdaemon_path(tmpctx, ld, name);
sd->pid = subd(path, name, debug_subd,
&msg_fd, disconnect_fd,
&msg_fd,
/* We only turn on subdaemon io logging if we're going
* to print it: too stressful otherwise! */
log_print_level(sd->log) < LOG_DBG,