aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-18 22:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

common/daemon_conn: add function to read an fd.

Browse Source 
We never needed this before.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-07-16 14:19:31 +09:30
committed by neil saitug
parent eff53495db
commit 430d6521a0
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
common/daemon_conn.c
View File

@@ -1,4 +1,5 @@
#include "config.h" #include "config.h"
#include <assert.h>
#include <ccan/fdpass/fdpass.h> #include <ccan/fdpass/fdpass.h>
#include <ccan/io/fdpass/fdpass.h> #include <ccan/io/fdpass/fdpass.h>
#include <common/daemon_conn.h> #include <common/daemon_conn.h>
@@ -8,6 +9,7 @@
struct daemon_conn { struct daemon_conn {
/* Last message we received */ /* Last message we received */
u8 *msg_in; u8 *msg_in;
int fd_in;
/* Queue of outgoing messages */ /* Queue of outgoing messages */
struct msg_queue *out; struct msg_queue *out;
@@ -17,11 +19,13 @@ struct daemon_conn {
/* Callback for incoming messages */ /* Callback for incoming messages */
struct io_plan *(*recv)(struct io_conn *conn, const u8 *, void *); struct io_plan *(*recv)(struct io_conn *conn, const u8 *, void *);
/* Callback with fd */
struct io_plan *(*recv_fd)(struct io_conn *conn, const u8 *, int, void *);
/* Called whenever we've cleared the msg_out queue. */ /* Called whenever we've cleared the msg_out queue. */
void (*outq_empty)(void *); void (*outq_empty)(void *);
/* Arg for both callbacks. */ /* Arg for all three callbacks. */
void *arg; void *arg;
}; };
@@ -40,6 +44,26 @@ struct io_plan *daemon_conn_read_next(struct io_conn *conn,
return io_read_wire(conn, dc, &dc->msg_in, handle_read, dc); return io_read_wire(conn, dc, &dc->msg_in, handle_read, dc);
} }
static struct io_plan *handle_recv_fd(struct io_conn *conn,
struct daemon_conn *dc)
{
return dc->recv_fd(conn, dc->msg_in, dc->fd_in, dc->arg);
}
struct io_plan *daemon_conn_read_with_fd_(struct io_conn *conn,
struct daemon_conn *dc,
struct io_plan *(*recv_fd)(struct io_conn *,
const u8 *,
int fd,
void *),
void *arg)
{
/* We only get this for the type! */
assert(arg == dc->arg);
dc->recv_fd = recv_fd;
return io_recv_fd(conn, &dc->fd_in, handle_recv_fd, dc);
}
static struct io_plan *daemon_conn_write_next(struct io_conn *conn, static struct io_plan *daemon_conn_write_next(struct io_conn *conn,
struct daemon_conn *dc) struct daemon_conn *dc)
{ {

22
common/daemon_conn.h
View File

@@ -50,6 +50,28 @@ void daemon_conn_send_fd(struct daemon_conn *dc, int fd);
struct io_plan *daemon_conn_read_next(struct io_conn *conn, struct io_plan *daemon_conn_read_next(struct io_conn *conn,
struct daemon_conn *dc); struct daemon_conn *dc);
/**
* daemon_conn_read_with_fd - Read a file descriptor, call again.
* (arg must be same as daemon_conn_new!)
* When recv() wants an fd with this message.
*/
#define daemon_conn_read_with_fd(conn, dc, recv_fd, arg) \
daemon_conn_read_with_fd_((conn), (dc), \
typesafe_cb_preargs(struct io_plan *, void *, \
(recv_fd), (arg), \
struct io_conn *, \
const u8 *, \
int), \
(arg))
struct io_plan *daemon_conn_read_with_fd_(struct io_conn *conn,
struct daemon_conn *dc,
struct io_plan *(*recv_fd)(struct io_conn *,
const u8 *,
int fd,
void *),
void *arg);
/** /**
* daemon_conn_sync_flush - Flush connection by sending all messages now.. * daemon_conn_sync_flush - Flush connection by sending all messages now..
*/ */