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

wire/wire_io: support take() arg to io_write_wire().

Browse Source 
This simplifies memory management, but means we have to keep the
original pointer.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2017-03-10 21:15:42 +10:30
parent cd62b74b1c
commit df7b68eea9
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
wire/wire_io.c
View File

@@ -3,6 +3,8 @@
#include <unistd.h> #include <unistd.h>
#include <ccan/io/io_plan.h> #include <ccan/io/io_plan.h>
#include <ccan/short_types/short_types.h> #include <ccan/short_types/short_types.h>
#include <ccan/take/take.h>
#include <ccan/tal/tal.h>
#include <wire/wire_io.h> #include <wire/wire_io.h>
/* /*
@@ -90,27 +92,32 @@ static int do_write_wire_header(int fd, struct io_plan_arg *arg)
/* Both bytes written? Set up for normal write of data. */ /* Both bytes written? Set up for normal write of data. */
if (arg->u2.s == INSIDE_HEADER_BIT + HEADER_LEN) if (arg->u2.s == INSIDE_HEADER_BIT + HEADER_LEN)
arg->u2.s = be16_to_cpu(hdr); arg->u2.s = 0;
return arg->u2.s == 0; return 0;
} }
static int do_write_wire(int fd, struct io_plan_arg *arg) static int do_write_wire(int fd, struct io_plan_arg *arg)
{ {
ssize_t ret; ssize_t ret;
size_t totlen = tal_len(arg->u1.cp);
/* Still writing header? */ /* Still writing header? */
if (arg->u2.s & INSIDE_HEADER_BIT) if (arg->u2.s & INSIDE_HEADER_BIT)
return do_write_wire_header(fd, arg); return do_write_wire_header(fd, arg);
/* Normal write */ /* Normal write */
ret = write(fd, arg->u1.cp, arg->u2.s); ret = write(fd, arg->u1.cp + arg->u2.s, totlen - arg->u2.s);
if (ret <= 0) if (ret < 0)
return -1; return -1;
arg->u1.cp += ret; arg->u2.s += ret;
arg->u2.s -= ret; if (arg->u2.s != totlen)
return arg->u2.s == 0; return 0;
if (taken(arg->u1.cp))
tal_free(arg->u1.cp);
return 1;
} }
/* Write message from data (tal_count(data) gives length). */ /* Write message from data (tal_count(data) gives length). */

2
wire/wire_io.h
View File

@@ -17,7 +17,7 @@ struct io_plan *io_read_wire_(struct io_conn *conn,
(next), (arg), struct io_conn *), \ (next), (arg), struct io_conn *), \
(arg)) (arg))
/* Write message from data (tal_count(data) gives length). */ /* Write message from data (tal_count(data) gives length). data can be take() */
struct io_plan *io_write_wire_(struct io_conn *conn, struct io_plan *io_write_wire_(struct io_conn *conn,
const u8 *data, const u8 *data,
struct io_plan *(*next)(struct io_conn *, void *), struct io_plan *(*next)(struct io_conn *, void *),