mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

gossipd: work around missing pwritev().

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2019-09-11 09:23:41 +09:30
parent 8843ab4fb7
commit afbed94a6c
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -34,6 +34,7 @@ changes.
### Fixed
- Relative `--lightning_dir` is now working again.
- Build: MacOS now builds again (missing pwritev).
### Security

34
gossipd/gossip_store.c
View File

@ -55,6 +55,38 @@ static void gossip_store_destroy(struct gossip_store *gs)
close(gs->fd);
}
#if HAVE_PWRITEV
static ssize_t gossip_pwritev(int fd, const struct iovec *iov, int iovcnt,
off_t offset)
{
return pwritev(fd, iov, iovcnt, offset);
}
#else /* Hello MacOS! */
static ssize_t gossip_pwritev(int fd, const struct iovec *iov, int iovcnt,
off_t offset)
{
u8 *buf;
size_t len;
ssize_t ret;
/* Make a temporary linear buffer to fall back to pwrite() */
len = 0;
for (size_t i = 0; i < iovcnt; i++)
len += iov[i].iov_len;
buf = tal_arr(NULL, u8, len);
len = 0;
for (size_t i = 0; i < iovcnt; i++) {
memcpy(buf + len, iov[i].iov_base, iov[i].iov_len);
len += iov[i].iov_len;
}
ret = pwrite(fd, buf, len, offset);
tal_free(buf);
return ret;
}
#endif /* !HAVE_PWRITEV */
static bool append_msg(int fd, const u8 *msg, u32 timestamp, u64 *len)
{
struct gossip_hdr hdr;
@ -71,7 +103,7 @@ static bool append_msg(int fd, const u8 *msg, u32 timestamp, u64 *len)
iov[0].iov_len = sizeof(hdr);
iov[1].iov_base = (void *)msg;
iov[1].iov_len = msglen;
if (pwritev(fd, iov, ARRAY_SIZE(iov), *len) != sizeof(hdr) + msglen)
if (gossip_pwritev(fd, iov, ARRAY_SIZE(iov), *len) != sizeof(hdr) + msglen)
return false;
*len += sizeof(hdr) + msglen;
return true;