lukechilds
/
lightning
mirror of https://github.com/lukechilds/lightning.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

subdaemon.c: subdaemon_setup() routine for all daemons. 

Our handling of SIGPIPE was incoherent and inconsistent, and we had much
cut & paste between the daemons.  They should *ALL* ignore SIGPIPE, and
much of the rest of the boilerplate can be shared, so should be.

Reported-by: @ZmnSCPxj
Fixes: #528
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
ppa-0.6.1
Rusty Russell 7 years ago
committed by Christian Decker
parent
a8de8a3140
commit
0f97b8cf36
16 changed files with 40 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      channeld/Makefile
  2. 15
      channeld/channel.c
  3. 2
      closingd/Makefile
  4. 14
      closingd/closing.c
  5. 2
      common/Makefile
  6. 7
      common/debug.h
  7. 16
      common/subdaemon.c
  8. 7
      common/subdaemon.h
  9. 2
      gossipd/Makefile
  10. 12
      gossipd/gossip.c
  11. 2
      hsmd/Makefile
  12. 12
      hsmd/hsm.c
  13. 2
      onchaind/Makefile
  14. 14
      onchaind/onchain.c
  15. 2
      openingd/Makefile
  16. 14
      openingd/opening.c

2
channeld/Makefile
View File

@ -38,7 +38,6 @@ CHANNELD_COMMON_OBJS := \
common/crypto_sync.o \
common/cryptomsg.o \
common/daemon_conn.o \
common/debug.o \
common/derive_basepoints.o \
common/dev_disconnect.o \
common/htlc_state.o \
@ -57,6 +56,7 @@ CHANNELD_COMMON_OBJS := \
common/pseudorand.o \
common/sphinx.o \
common/status.o \
common/subdaemon.o \
common/timeout.o \
common/type_to_string.o \
common/utils.o \

15
channeld/channel.c
View File

@ -27,7 +27,6 @@
#include <channeld/full_channel.h>
#include <channeld/gen_channel_wire.h>
#include <common/crypto_sync.h>
#include <common/debug.h>
#include <common/derive_basepoints.h>
#include <common/dev_disconnect.h>
#include <common/htlc_tx.h>
@ -38,6 +37,7 @@
#include <common/ping.h>
#include <common/sphinx.h>
#include <common/status.h>
#include <common/subdaemon.h>
#include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/version.h>
@ -49,7 +49,6 @@
#include <hsmd/gen_hsm_client_wire.h>
#include <inttypes.h>
#include <secp256k1.h>
#include <signal.h>
#include <stdio.h>
#include <wire/gen_onion_wire.h>
#include <wire/peer_wire.h>
@ -2499,17 +2498,7 @@ int main(int argc, char *argv[])
fd_set fds_in, fds_out;
struct peer *peer;
if (argc == 2 && streq(argv[1], "--version")) {
printf("%s\n", version());
exit(0);
}
subdaemon_debug(argc, argv);
/* We handle write returning errors! */
signal(SIGCHLD, SIG_IGN);
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY
| SECP256K1_CONTEXT_SIGN);
subdaemon_setup(argc, argv);
peer = tal(NULL, struct peer);
peer->num_pings_outstanding = 0;

2
closingd/Makefile
View File

@ -47,7 +47,6 @@ CLOSINGD_COMMON_OBJS := \
common/crypto_sync.o \
common/cryptomsg.o \
common/daemon_conn.o \
common/debug.o \
common/dev_disconnect.o \
common/derive_basepoints.o \
common/htlc_wire.o \
@ -56,6 +55,7 @@ CLOSINGD_COMMON_OBJS := \
common/peer_failed.o \
common/permute_tx.o \
common/status.o \
common/subdaemon.o \
common/type_to_string.o \
common/utils.o \
common/version.o

14
closingd/closing.c
View File

@ -2,17 +2,16 @@
#include <closingd/gen_closing_wire.h>
#include <common/close_tx.h>
#include <common/crypto_sync.h>
#include <common/debug.h>
#include <common/derive_basepoints.h>
#include <common/htlc.h>
#include <common/peer_failed.h>
#include <common/status.h>
#include <common/subdaemon.h>
#include <common/type_to_string.h>
#include <common/utils.h>
#include <common/version.h>
#include <errno.h>
#include <inttypes.h>
#include <signal.h>
#include <stdio.h>
#include <unistd.h>
#include <wire/peer_wire.h>
@ -170,17 +169,8 @@ int main(int argc, char *argv[])
u64 next_index[NUM_SIDES], revocations_received;
u64 gossip_index;
if (argc == 2 && streq(argv[1], "--version")) {
printf("%s\n", version());
exit(0);
}
subdaemon_debug(argc, argv);
subdaemon_setup(argc, argv);
/* We handle write returning errors! */
signal(SIGCHLD, SIG_IGN);
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY
| SECP256K1_CONTEXT_SIGN);
status_setup_sync(REQ_FD);
msg = wire_sync_read(ctx, REQ_FD);

2
common/Makefile
View File

@ -9,7 +9,6 @@ COMMON_SRC := \
common/crypto_sync.c \
common/cryptomsg.c \
common/daemon_conn.c \
common/debug.c \
common/derive_basepoints.c \
common/dev_disconnect.c \
common/funding_tx.c \
@ -31,6 +30,7 @@ COMMON_SRC := \
common/pseudorand.c \
common/sphinx.c \
common/status.c \
common/subdaemon.c \
common/timeout.c \
common/type_to_string.c \
common/utils.c \

7
common/debug.h
View File

@ -1,7 +0,0 @@
#ifndef LIGHTNING_COMMON_DEBUG_H
#define LIGHTNING_COMMON_DEBUG_H
#include "config.h"
void subdaemon_debug(int argc, char *argv[]);
#endif /* LIGHTNING_COMMON_DEBUG_H */

16
common/debug.c → common/subdaemon.c
View File

@ -1,9 +1,11 @@
#include <backtrace.h>
#include <ccan/err/err.h>
#include <ccan/str/str.h>
#include <common/debug.h>
#include <common/dev_disconnect.h>
#include <common/status.h>
#include <common/subdaemon.h>
#include <common/utils.h>
#include <common/version.h>
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
@ -48,17 +50,27 @@ static void crashlog_activate(void)
sigaction(SIGBUS, &sa, NULL);
}
void subdaemon_debug(int argc, char *argv[])
void subdaemon_setup(int argc, char *argv[])
{
#if DEVELOPER
int i;
bool printed = false;
#endif
if (argc == 2 && streq(argv[1], "--version")) {
printf("%s\n", version());
exit(0);
}
err_set_progname(argv[0]);
backtrace_state = backtrace_create_state(argv[0], 0, NULL, NULL);
crashlog_activate();
/* We handle write returning errors! */
signal(SIGPIPE, SIG_IGN);
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY
| SECP256K1_CONTEXT_SIGN);
#if DEVELOPER
for (i = 1; i < argc; i++) {
if (strstarts(argv[i], "--dev-disconnect=")) {

7
common/subdaemon.h
View File

@ -0,0 +1,7 @@
#ifndef LIGHTNING_COMMON_SUBDAEMON_H
#define LIGHTNING_COMMON_SUBDAEMON_H
#include "config.h"
void subdaemon_setup(int argc, char *argv[]);
#endif /* LIGHTNING_COMMON_SUBDAEMON_H */

2
gossipd/Makefile
View File

@ -39,13 +39,13 @@ GOSSIPD_COMMON_OBJS := \
common/crypto_sync.o \
common/cryptomsg.o \
common/daemon_conn.o \
common/debug.o \
common/dev_disconnect.o \
common/io_debug.o \
common/msg_queue.o \
common/ping.o \
common/pseudorand.o \
common/status.o \
common/subdaemon.o \
common/timeout.o \
common/type_to_string.o \
common/utils.o \

12
gossipd/gossip.c
View File

@ -15,10 +15,10 @@
#include <ccan/timer/timer.h>
#include <common/cryptomsg.h>
#include <common/daemon_conn.h>
#include <common/debug.h>
#include <common/io_debug.h>
#include <common/ping.h>
#include <common/status.h>
#include <common/subdaemon.h>
#include <common/timeout.h>
#include <common/type_to_string.h>
#include <common/utils.h>
@ -1625,17 +1625,9 @@ int main(int argc, char *argv[])
{
struct daemon *daemon;
subdaemon_debug(argc, argv);
subdaemon_setup(argc, argv);
io_poll_override(debug_poll);
if (argc == 2 && streq(argv[1], "--version")) {
printf("%s\n", version());
exit(0);
}
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY |
SECP256K1_CONTEXT_SIGN);
daemon = tal(NULL, struct daemon);
list_head_init(&daemon->peers);
list_head_init(&daemon->reaching);

2
hsmd/Makefile
View File

@ -22,7 +22,6 @@ LIGHTNINGD_HSM_OBJS := $(LIGHTNINGD_HSM_SRC:.c=.o)
HSMD_COMMON_OBJS := \
common/bip32.o \
common/daemon_conn.o \
common/debug.o \
common/derive_basepoints.o \
common/funding_tx.o \
common/hash_u5.o \
@ -31,6 +30,7 @@ HSMD_COMMON_OBJS := \
common/msg_queue.o \
common/permute_tx.o \
common/status.o \
common/subdaemon.o \
common/type_to_string.o \
common/utils.o \
common/utxo.o \

12
hsmd/hsm.c
View File

@ -14,13 +14,13 @@
#include <ccan/read_write_all/read_write_all.h>
#include <ccan/take/take.h>
#include <common/daemon_conn.h>
#include <common/debug.h>
#include <common/derive_basepoints.h>
#include <common/funding_tx.h>
#include <common/hash_u5.h>
#include <common/io_debug.h>
#include <common/key_derive.h>
#include <common/status.h>
#include <common/subdaemon.h>
#include <common/type_to_string.h>
#include <common/utils.h>
#include <common/version.h>
@ -833,17 +833,9 @@ int main(int argc, char *argv[])
{
struct client *client;
if (argc == 2 && streq(argv[1], "--version")) {
printf("%s\n", version());
exit(0);
}
subdaemon_debug(argc, argv);
subdaemon_setup(argc, argv);
io_poll_override(debug_poll);
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY
| SECP256K1_CONTEXT_SIGN);
client = new_client(NULL, NULL, HSM_CAP_MASTER | HSM_CAP_SIGN_GOSSIP, handle_client, STDIN_FILENO);
/* We're our own master! */

2
onchaind/Makefile
View File

@ -48,7 +48,6 @@ $(LIGHTNINGD_ONCHAIN_OBJS): $(LIGHTNINGD_HEADERS)
# Common source we use.
ONCHAIND_COMMON_OBJS := \
common/daemon_conn.o \
common/debug.o \
common/derive_basepoints.o \
common/dev_disconnect.o \
common/htlc_tx.o \
@ -60,6 +59,7 @@ ONCHAIND_COMMON_OBJS := \
common/msg_queue.o \
common/permute_tx.o \
common/status.o \
common/subdaemon.o \
common/type_to_string.o \
common/utils.o \
common/version.o

14
onchaind/onchain.c
View File

@ -3,13 +3,13 @@
#include <ccan/mem/mem.h>
#include <ccan/structeq/structeq.h>
#include <ccan/tal/str/str.h>
#include <common/debug.h>
#include <common/derive_basepoints.h>
#include <common/htlc_tx.h>
#include <common/initial_commit_tx.h>
#include <common/key_derive.h>
#include <common/keyset.h>
#include <common/status.h>
#include <common/subdaemon.h>
#include <common/type_to_string.h>
#include <common/utils.h>
#include <common/version.h>
@ -18,7 +18,6 @@
#include <lightningd/peer_state.h>
#include <onchaind/gen_onchain_wire.h>
#include <onchaind/onchain_types.h>
#include <signal.h>
#include <stdio.h>
#include <unistd.h>
#include <wire/wire_sync.h>
@ -1976,17 +1975,8 @@ int main(int argc, char *argv[])
bool *tell_if_missing, *tell_immediately;
u32 tx_blockheight;
if (argc == 2 && streq(argv[1], "--version")) {
printf("%s\n", version());
exit(0);
}
subdaemon_debug(argc, argv);
subdaemon_setup(argc, argv);
/* We handle write returning errors! */
signal(SIGCHLD, SIG_IGN);
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY
| SECP256K1_CONTEXT_SIGN);
status_setup_sync(REQ_FD);
missing_htlc_msgs = tal_arr(ctx, u8 *, 0);

2
openingd/Makefile
View File

@ -41,7 +41,6 @@ OPENINGD_COMMON_OBJS := \
common/crypto_sync.o \
common/cryptomsg.o \
common/daemon_conn.o \
common/debug.o \
common/derive_basepoints.o \
common/dev_disconnect.o \
common/funding_tx.o \
@ -57,6 +56,7 @@ OPENINGD_COMMON_OBJS := \
common/permute_tx.o \
common/pseudorand.o \
common/status.o \
common/subdaemon.o \
common/type_to_string.o \
common/utils.o \
common/utxo.o \

14
openingd/opening.c
View File

@ -7,7 +7,6 @@
#include <ccan/structeq/structeq.h>
#include <ccan/tal/str/str.h>
#include <common/crypto_sync.h>
#include <common/debug.h>
#include <common/derive_basepoints.h>
#include <common/funding_tx.h>
#include <common/initial_channel.h>
@ -16,6 +15,7 @@
#include <common/ping.h>
#include <common/pseudorand.h>
#include <common/status.h>
#include <common/subdaemon.h>
#include <common/type_to_string.h>
#include <common/version.h>
#include <common/wire_error.h>
@ -23,7 +23,6 @@
#include <inttypes.h>
#include <openingd/gen_opening_wire.h>
#include <secp256k1.h>
#include <signal.h>
#include <stdio.h>
#include <wally_bip32.h>
#include <wire/gen_peer_wire.h>
@ -761,17 +760,8 @@ int main(int argc, char *argv[])
struct ext_key bip32_base;
u32 network_index;
if (argc == 2 && streq(argv[1], "--version")) {
printf("%s\n", version());
exit(0);
}
subdaemon_debug(argc, argv);
subdaemon_setup(argc, argv);
/* We handle write returning errors! */
signal(SIGCHLD, SIG_IGN);
secp256k1_ctx = secp256k1_context_create(SECP256K1_CONTEXT_VERIFY
| SECP256K1_CONTEXT_SIGN);
status_setup_sync(REQ_FD);
msg = wire_sync_read(state, REQ_FD);

Write Preview
Loading…
Cancel
Save