ccan/io: have io_plan mappable back to io_conn.

[ccan] / ccan / io / backend.h

diff --git a/ccan/io/backend.h b/ccan/io/backend.h
index 090bff6fb92bf987520d5a94d72a86de92f20036..c071c5d6c5939372bcbb290a0a580e5257076e38 100644 (file)
--- a/ccan/io/backend.h
+++ b/ccan/io/backend.h
@@ -2,7 +2,6 @@
 #ifndef CCAN_IO_BACKEND_H
 #define CCAN_IO_BACKEND_H
 #include <stdbool.h>
-#include <poll.h>
 #include "io_plan.h"
 #include <ccan/list/list.h>
 
@@ -26,8 +25,9 @@ struct io_listener {
 enum io_plan_status {
        /* As before calling next function. */
        IO_UNSET,
-       /* Normal. */
-       IO_POLLING,
+       /* Normal, but haven't started yet. */
+       IO_POLLING_NOTSTARTED,
+       IO_POLLING_STARTED,
        /* Waiting for io_wake */
        IO_WAITING,
        /* Always do this. */
@@ -37,6 +37,7 @@ enum io_plan_status {
 /**
  * struct io_plan - one half of I/O to do
  * @status: the status of this plan.
+ * @dir: are we plan[0] or plan[1] inside io_conn?
  * @io: function to call when fd becomes read/writable, returns 0 to be
  *      called again, 1 if it's finished, and -1 on error (fd will be closed)
  * @next: the next function which is called if io returns 1.
@@ -45,6 +46,7 @@ enum io_plan_status {
  */
 struct io_plan {
        enum io_plan_status status;
+       enum io_direction dir;
 
        int (*io)(int fd, struct io_plan_arg *arg);
 
@@ -73,6 +75,7 @@ bool add_listener(struct io_listener *l);
 bool add_conn(struct io_conn *c);
 bool add_duplex(struct io_conn *c);
 void del_listener(struct io_listener *l);
+void cleanup_conn_without_close(struct io_conn *c);
 void backend_new_always(struct io_conn *conn);
 void backend_new_plan(struct io_conn *conn);
 void remove_from_always(struct io_conn *conn);