Added new silc_schedule_with_fd to select() with specific fd.

diff --git a/lib/silcutil/silcschedule.c b/lib/silcutil/silcschedule.c
index 1d0814264e8e04f1004cf204233c31df55c85988..efa3d20c5aecef5cd0f1246a29da2b4663b0f2bd 100644 (file)
--- a/lib/silcutil/silcschedule.c
+++ b/lib/silcutil/silcschedule.c
@@ -511,3 +511,48 @@ void silc_schedule()
   /* Start the scheduler loop */
   while (silc_schedule_one(-1)) ;
 }
+
+/* Run normal select() for `fd' and return after file descriptor changes
+   status or timeout expires. The `event' is either SILC_TASK_READ or
+   SILC_TASK_WRITE. */
+
+int silc_schedule_with_fd(int fd, unsigned int event,
+                         unsigned long usecs, unsigned long secs)
+{
+  struct timeval *tp = NULL, timeout;
+  fd_set *ip = NULL, in;
+  fd_set *op = NULL, out;
+  int ret;
+
+  if (usecs + secs > 0) {
+    timeout.tv_sec = secs;
+    timeout.tv_usec = usecs;
+    tp = &timeout;
+  }
+
+  if (event == SILC_TASK_READ) {
+    FD_ZERO(&in);
+    FD_SET(fd, &in);
+    ip = ∈
+  }
+
+  if (event == SILC_TASK_WRITE) {
+    FD_ZERO(&out);
+    FD_SET(fd, &out);
+    op = &out;
+  }
+
+  ret = select(fd + 1, ip, op, NULL, tp);
+  switch (ret) {
+  case -1:
+    return FALSE;
+    break;
+  case 0:
+    return FALSE;
+    break;
+  default:
+    break;
+  }
+
+  return TRUE;
+}

diff --git a/lib/silcutil/silcschedule.h b/lib/silcutil/silcschedule.h
index ce9070cf9f3ebf3ef56f928cfc4e51bae47a8dd6..2e68dbbf1520d985f8802311cb3645da5276c0e0 100644 (file)
--- a/lib/silcutil/silcschedule.h
+++ b/lib/silcutil/silcschedule.h
@@ -120,5 +120,7 @@ void silc_schedule_set_listen_fd(int fd, unsigned int iomask);
 void silc_schedule_unset_listen_fd(int fd);
 void silc_schedule();
 int silc_schedule_one(int block);
+int silc_schedule_with_fd(int fd, unsigned int event,
+                         unsigned long usecs, unsigned long secs);
 
 #endif