From 44c6a22e5f95d5879f20216907b4fbef89cd3b52 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sat, 25 Jan 2025 11:08:11 +1030 Subject: [PATCH] dev_disconnect: rename to dev_disconnect_out, in preparation for incoming filters. Signed-off-by: Rusty Russell --- common/dev_disconnect.c | 8 ++++---- common/dev_disconnect.h | 16 ++++++++-------- connectd/multiplex.c | 14 +++++++------- connectd/peer_exchange_initmsg.c | 14 +++++++------- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/common/dev_disconnect.c b/common/dev_disconnect.c index 289bd9fde..76df764b9 100644 --- a/common/dev_disconnect.c +++ b/common/dev_disconnect.c @@ -50,20 +50,20 @@ void dev_disconnect_init(int fd) dev_disconnect_fd = fd; } -enum dev_disconnect dev_disconnect(const struct node_id *id, int pkt_type) +enum dev_disconnect_out dev_disconnect_out(const struct node_id *id, int pkt_type) { if (dev_disconnect_fd == -1) - return DEV_DISCONNECT_NORMAL; + return DEV_DISCONNECT_OUT_NORMAL; if (!dev_disconnect_count) next_dev_disconnect(); if (!dev_disconnect_line[0] || !streq(peer_wire_name(pkt_type), dev_disconnect_line+1)) - return DEV_DISCONNECT_NORMAL; + return DEV_DISCONNECT_OUT_NORMAL; if (--dev_disconnect_count != 0) { - return DEV_DISCONNECT_NORMAL; + return DEV_DISCONNECT_OUT_NORMAL; } if (lseek(dev_disconnect_fd, dev_disconnect_len+1, SEEK_CUR) < 0) { diff --git a/common/dev_disconnect.h b/common/dev_disconnect.h index 1b28fd30d..333ebf26f 100644 --- a/common/dev_disconnect.h +++ b/common/dev_disconnect.h @@ -5,23 +5,23 @@ struct node_id; -enum dev_disconnect { +enum dev_disconnect_out { /* Do nothing. */ - DEV_DISCONNECT_NORMAL = '=', + DEV_DISCONNECT_OUT_NORMAL = '=', /* Close connection before sending packet. */ - DEV_DISCONNECT_BEFORE = '-', + DEV_DISCONNECT_OUT_BEFORE = '-', /* Close connection after sending packet. */ - DEV_DISCONNECT_AFTER = '+', + DEV_DISCONNECT_OUT_AFTER = '+', /* Drop message (don't send to peer) */ - DEV_DISCONNECT_DROP = '$', + DEV_DISCONNECT_OUT_DROP = '$', /* Swallow all writes from now on, and do no more reads. */ - DEV_DISCONNECT_BLACKHOLE = '0', + DEV_DISCONNECT_OUT_BLACKHOLE = '0', /* Don't use connection after sending packet, but don't close. */ - DEV_DISCONNECT_DISABLE_AFTER = 'x', + DEV_DISCONNECT_OUT_DISABLE_AFTER = 'x', }; /* Force a close fd before or after a certain packet type */ -enum dev_disconnect dev_disconnect(const struct node_id *id, int pkt_type); +enum dev_disconnect_out dev_disconnect_out(const struct node_id *id, int pkt_type); /* Make next write on fd fail as if they'd disconnected. */ void dev_sabotage_fd(int fd, bool close_fd); diff --git a/connectd/multiplex.c b/connectd/multiplex.c index 817994b67..e49bb768d 100644 --- a/connectd/multiplex.c +++ b/connectd/multiplex.c @@ -415,25 +415,25 @@ static struct io_plan *encrypt_and_send(struct peer *peer, { int type = fromwire_peektype(msg); - switch (dev_disconnect(&peer->id, type)) { - case DEV_DISCONNECT_BEFORE: + switch (dev_disconnect_out(&peer->id, type)) { + case DEV_DISCONNECT_OUT_BEFORE: if (taken(msg)) tal_free(msg); return io_close(peer->to_peer); - case DEV_DISCONNECT_AFTER: + case DEV_DISCONNECT_OUT_AFTER: /* Disallow reads from now on */ peer->dev_read_enabled = false; /* Using io_close here can lose the data we're about to send! */ next = io_sock_shutdown_cb; break; - case DEV_DISCONNECT_BLACKHOLE: + case DEV_DISCONNECT_OUT_BLACKHOLE: /* Disable both reads and writes from now on */ peer->dev_read_enabled = false; peer->dev_writes_enabled = talz(peer, u32); break; - case DEV_DISCONNECT_NORMAL: + case DEV_DISCONNECT_OUT_NORMAL: break; - case DEV_DISCONNECT_DROP: + case DEV_DISCONNECT_OUT_DROP: /* Drop this message and continue */ if (taken(msg)) tal_free(msg); @@ -441,7 +441,7 @@ static struct io_plan *encrypt_and_send(struct peer *peer, io_wake(&peer->subds); return msg_queue_wait(peer->to_peer, peer->peer_outq, next, peer); - case DEV_DISCONNECT_DISABLE_AFTER: + case DEV_DISCONNECT_OUT_DISABLE_AFTER: peer->dev_read_enabled = false; peer->dev_writes_enabled = tal(peer, u32); *peer->dev_writes_enabled = 1; diff --git a/connectd/peer_exchange_initmsg.c b/connectd/peer_exchange_initmsg.c index 63b3ddb8d..a7df0d6eb 100644 --- a/connectd/peer_exchange_initmsg.c +++ b/connectd/peer_exchange_initmsg.c @@ -280,21 +280,21 @@ struct io_plan *peer_exchange_initmsg(struct io_conn *conn, peer->msg = cryptomsg_encrypt_msg(peer, &peer->cs, take(peer->msg)); next = read_init; - switch (dev_disconnect(&peer->id, WIRE_INIT)) { - case DEV_DISCONNECT_BEFORE: + switch (dev_disconnect_out(&peer->id, WIRE_INIT)) { + case DEV_DISCONNECT_OUT_BEFORE: dev_sabotage_fd(io_conn_fd(conn), true); break; - case DEV_DISCONNECT_AFTER: + case DEV_DISCONNECT_OUT_AFTER: next = dev_peer_write_postclose; break; - case DEV_DISCONNECT_BLACKHOLE: + case DEV_DISCONNECT_OUT_BLACKHOLE: status_failed(STATUS_FAIL_INTERNAL_ERROR, "Blackhole not supported during handshake"); break; - case DEV_DISCONNECT_NORMAL: - case DEV_DISCONNECT_DROP: + case DEV_DISCONNECT_OUT_NORMAL: + case DEV_DISCONNECT_OUT_DROP: break; - case DEV_DISCONNECT_DISABLE_AFTER: + case DEV_DISCONNECT_OUT_DISABLE_AFTER: next = dev_peer_write_post_sabotage; break; }