aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-02-23 15:04:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: make plugin_kill() free the plugin.

Browse Source 
This is what I expected from plugin_kill, and now all the callers do the
equivalent anywat, it's easy.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-05-05 10:44:21 +09:30
parent 69b07cf5a6
commit 051cbf7cc4
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lightningd/plugin.c
View File

@@ -216,6 +216,7 @@ void plugin_kill(struct plugin *plugin, char *fmt, ...)
}
check_plugins_resolved(plugin->plugins);
tal_free(plugin);
}
/**
@@ -483,7 +484,8 @@ static struct io_plan *plugin_read_json(struct io_conn *conn,
if (err) {
plugin_kill(plugin, "%s", err);
return io_close(plugin->stdout_conn);
/* plugin_kill frees plugin */
return io_close(NULL);
}
} while (success);
@@ -966,11 +968,12 @@ static const char *plugin_hooks_add(struct plugin *plugin, const char *buffer,
static void plugin_manifest_timeout(struct plugin *plugin)
{
bool startup = plugin->plugins->startup;
plugin_kill(plugin,
"failed to respond to \"%s\" in time, terminating.",
plugin->plugin_state == AWAITING_GETMANIFEST_RESPONSE
? "getmanifest" : "init");
if (plugin->plugins->startup)
if (startup)
fatal("Can't recover from plugin failure, terminating.");
}
@@ -1286,7 +1289,6 @@ bool plugins_send_getmanifest(struct plugins *plugins)
fatal("error starting plugin '%s': %s", p->cmd,
strerror(errno));
plugin_kill(p, "error starting: %s", strerror(errno));
tal_free(p);
}
return sent;