It's a common thing to want to do, so add helper here.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0)
err(1, "connecting socket");
/* Make nonblocking. */
if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0)
err(1, "connecting socket");
/* Make nonblocking. */
- fcntl(sock[i], F_SETFD, fcntl(sock[i], F_GETFD)|O_NONBLOCK);
+ io_fd_block(sock[i], false);
if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0)
err(1, "connecting socket");
/* Make nonblocking. */
if (connect(sock[i], (void *)addr, sizeof(*addr)) != 0)
err(1, "connecting socket");
/* Make nonblocking. */
- fcntl(sock[i], F_SETFD, fcntl(sock[i], F_GETFD)|O_NONBLOCK);
+ io_fd_block(sock[i], false);
-static void set_blocking(int fd, bool block)
+bool io_fd_block(int fd, bool block)
{
int flags = fcntl(fd, F_GETFL);
{
int flags = fcntl(fd, F_GETFL);
+ if (flags == -1)
+ return false;
+
if (block)
flags &= ~O_NONBLOCK;
else
flags |= O_NONBLOCK;
if (block)
flags &= ~O_NONBLOCK;
else
flags |= O_NONBLOCK;
- fcntl(fd, F_SETFL, flags);
+ return fcntl(fd, F_SETFL, flags) != -1;
}
struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
}
struct io_conn *io_new_conn_(const tal_t *ctx, int fd,
return tal_free(conn);
/* Keep our I/O async. */
return tal_free(conn);
/* Keep our I/O async. */
- set_blocking(fd, false);
+ io_fd_block(fd, false);
/* We start with out doing nothing, and in doing our init. */
conn->plan[IO_OUT].status = IO_UNSET;
/* We start with out doing nothing, and in doing our init. */
conn->plan[IO_OUT].status = IO_UNSET;
struct io_plan *io_close_taken_fd(struct io_conn *conn)
{
struct io_plan *io_close_taken_fd(struct io_conn *conn)
{
- set_blocking(conn->fd.fd, true);
+ io_fd_block(conn->fd.fd, true);
cleanup_conn_without_close(conn);
return io_close(conn);
cleanup_conn_without_close(conn);
return io_close(conn);
return true;
/* Synchronous please. */
return true;
/* Synchronous please. */
- set_blocking(io_conn_fd(conn), true);
+ io_fd_block(io_conn_fd(conn), true);
again:
switch (plan->io(conn->fd.fd, &plan->arg)) {
again:
switch (plan->io(conn->fd.fd, &plan->arg)) {
- set_blocking(io_conn_fd(conn), false);
+ io_fd_block(io_conn_fd(conn), false);
*/
bool io_flush_sync(struct io_conn *conn);
*/
bool io_flush_sync(struct io_conn *conn);
+/**
+ * io_fd_block - helper to set an fd blocking/nonblocking.
+ * @fd: the file descriptor
+ * @block: true to set blocking, false to set non-blocking.
+ *
+ * Generally only fails is @fd isn't a valid file descriptor, otherwise
+ * returns true.
+ */
+bool io_fd_block(int fd, bool block);
+
/**
* io_time_override - override the normal call for time.
* @nowfn: the function to call.
/**
* io_time_override - override the normal call for time.
* @nowfn: the function to call.