s3: Add poll_one_fd()

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 107d5055fbb53a8aa154bc74c6117a43c9910e24..52a08ae5985796d65e104c04cab67b522de898ef 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -1334,6 +1334,7 @@ struct tevent_req *getaddrinfo_send(TALLOC_CTX *mem_ctx,
                                    const char *service,
                                    const struct addrinfo *hints);
 int getaddrinfo_recv(struct tevent_req *req, struct addrinfo **res);
+int poll_one_fd(int fd, int events, int timeout, int *revents);
 struct tevent_req *tstream_read_packet_send(TALLOC_CTX *mem_ctx,
                                            struct tevent_context *ev,
                                            struct tstream_context *stream,

diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 1de6d17a41ff0cac053024400c6d796def3acc30..3dd84fe8d701b10b9a6d8ef11b7d64df929e5f09 100644 (file)
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1766,3 +1766,30 @@ int getaddrinfo_recv(struct tevent_req *req, struct addrinfo **res)
        }
        return state->ret;
 }
+
+int poll_one_fd(int fd, int events, int timeout, int *revents)
+{
+       struct pollfd *fds;
+       int ret;
+       int saved_errno;
+
+       fds = TALLOC_ZERO_ARRAY(talloc_tos(), struct pollfd, 2);
+       if (fds == NULL) {
+               errno = ENOMEM;
+               return -1;
+       }
+       fds[0].fd = fd;
+       fds[0].events = events;
+
+       ret = sys_poll(fds, 1, timeout);
+
+       /*
+        * Assign whatever poll did, even in the ret<=0 case.
+        */
+       *revents = fds[0].revents;
+       saved_errno = errno;
+       TALLOC_FREE(fds);
+       errno = saved_errno;
+
+       return ret;
+}