common/socket_close: remove now only connectd talks to peer.

connectd does this internally now using ccan/io, with appropriate credit for ZmnSCPxj who wrote this code in the first place. Signed-off-by: Rusty Russell <[email protected]>
ApeBlin · Jan 24, 2022 · be299c0 · be299c0
1 parent 3281d72
commit be299c0
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 78 deletions.
diff --git a/closingd/Makefile b/closingd/Makefile
@@ -50,7 +50,6 @@ CLOSINGD_COMMON_OBJS :=				\
 	common/status_wiregen.o			\
 	common/read_peer_msg.o			\
 	common/setup.o				\
-	common/socket_close.o			\
 	common/status.o				\
 	common/status_wire.o			\
 	common/subdaemon.o			\

diff --git a/closingd/closingd.c b/closingd/closingd.c
@@ -14,7 +14,6 @@
 #include <common/peer_io.h>
 #include <common/per_peer_state.h>
 #include <common/read_peer_msg.h>
-#include <common/socket_close.h>
 #include <common/status.h>
 #include <common/subdaemon.h>
 #include <common/type_to_string.h>
@@ -1097,10 +1096,7 @@ int main(int argc, char *argv[])
 #endif
 
 	/* We're done! */
-	/* Properly close the channel first. */
-	if (!socket_close(pps->peer_fd))
-		status_unusual("Closing and draining peerfd gave error: %s",
-			       strerror(errno));
+
 	/* Sending the below will kill us! */
 	wire_sync_write(REQ_FD, take(towire_closingd_complete(NULL)));
 	tal_free(ctx);

diff --git a/common/Makefile b/common/Makefile
@@ -76,7 +76,6 @@ COMMON_SRC_NOGEN :=				\
 	common/route.c				\
 	common/setup.c				\
 	common/shutdown_scriptpubkey.c		\
-	common/socket_close.c			\
 	common/sphinx.c				\
 	common/status.c				\
 	common/status_levels.c			\

diff --git a/common/socket_close.c b/common/socket_close.c
diff --git a/common/socket_close.h b/common/socket_close.h