silc_stream_set_notifier and silc_schedule_set_listen_fd now

[silc.git] / lib / silcutil / silcfdstream.c

diff --git a/lib/silcutil/silcfdstream.c b/lib/silcutil/silcfdstream.c
index a5ce7b8747189c6f4dfcdcec0cc01b9f2b03eaca..67ad3269c7f514d2e1ee1f5ccbc59b81877ee92c 100644 (file)
--- a/lib/silcutil/silcfdstream.c
+++ b/lib/silcutil/silcfdstream.c
@@ -49,14 +49,14 @@ SILC_TASK_CALLBACK(silc_fd_stream_io)
     return;
 
   switch (type) {
-  case SILC_TASK_WRITE:
-    stream->notifier(stream, SILC_STREAM_CAN_WRITE, stream->notifier_context);
-    break;
-
   case SILC_TASK_READ:
     stream->notifier(stream, SILC_STREAM_CAN_READ, stream->notifier_context);
     break;
 
+  case SILC_TASK_WRITE:
+    stream->notifier(stream, SILC_STREAM_CAN_WRITE, stream->notifier_context);
+    break;
+
   default:
     break;
   }
@@ -111,7 +111,7 @@ SilcStream silc_fd_stream_file(const char *filename,
   if (writing)
     flags |= O_CREAT | O_WRONLY;
   if (reading && writing)
-    flags |= O_CREAT | O_RDWR;
+    flags = O_CREAT | O_RDWR;
 
   fd = silc_file_open(filename, flags);
   if (fd < 0)
@@ -158,8 +158,6 @@ int silc_fd_stream_read(SilcStream stream, unsigned char *buf,
   SilcFDStream fd_stream = stream;
   int len = 0;
 
-  if (!SILC_IS_FD_STREAM(fd_stream))
-    return -2;
   if (!fd_stream->notifier)
     return -2;
 
@@ -196,8 +194,6 @@ int silc_fd_stream_write(SilcStream stream, const unsigned char *data,
   SilcFDStream fd_stream = stream;
   int ret;
 
-  if (!SILC_IS_FD_STREAM(fd_stream))
-    return -2;
   if (!fd_stream->notifier)
     return -2;
 
@@ -234,16 +230,15 @@ SilcBool silc_fd_stream_close(SilcStream stream)
 {
   SilcFDStream fd_stream = stream;
 
-  if (!SILC_IS_FD_STREAM(fd_stream))
-    return FALSE;
-
   if (fd_stream->fd1 > 0) {
     silc_file_close(fd_stream->fd1);
     silc_schedule_unset_listen_fd(fd_stream->schedule, fd_stream->fd1);
+    silc_schedule_task_del_by_fd(fd_stream->schedule, fd_stream->fd1);
   }
   if (fd_stream->fd2 > 0 && fd_stream->fd2 != fd_stream->fd1) {
     silc_file_close(fd_stream->fd2);
     silc_schedule_unset_listen_fd(fd_stream->schedule, fd_stream->fd2);
+    silc_schedule_task_del_by_fd(fd_stream->schedule, fd_stream->fd2);
   }
 
   return TRUE;
@@ -253,29 +248,19 @@ SilcBool silc_fd_stream_close(SilcStream stream)
 
 void silc_fd_stream_destroy(SilcStream stream)
 {
-  SilcFDStream fd_stream = stream;
-
-  if (!SILC_IS_FD_STREAM(fd_stream))
-    return;
-
   silc_fd_stream_close(stream);
-  silc_schedule_task_del_by_fd(fd_stream->schedule, fd_stream->fd1);
-  silc_schedule_task_del_by_fd(fd_stream->schedule, fd_stream->fd2);
   silc_free(stream);
 }
 
 /* Sets stream notification callback for the stream */
 
-void silc_fd_stream_notifier(SilcStream stream,
-                            SilcSchedule schedule,
-                            SilcStreamNotifier callback,
-                            void *context)
+SilcBool silc_fd_stream_notifier(SilcStream stream,
+                                SilcSchedule schedule,
+                                SilcStreamNotifier callback,
+                                void *context)
 {
   SilcFDStream fd_stream = stream;
 
-  if (!SILC_IS_FD_STREAM(fd_stream))
-    return;
-
   SILC_LOG_DEBUG(("Setting stream notifier callback"));
 
   fd_stream->notifier = callback;
@@ -301,7 +286,11 @@ void silc_fd_stream_notifier(SilcStream stream,
   } else {
     silc_schedule_unset_listen_fd(fd_stream->schedule, fd_stream->fd1);
     silc_schedule_unset_listen_fd(fd_stream->schedule, fd_stream->fd2);
+    silc_schedule_task_del_by_fd(fd_stream->schedule, fd_stream->fd1);
+    silc_schedule_task_del_by_fd(fd_stream->schedule, fd_stream->fd2);
   }
+
+  return TRUE;
 }
 
 /* Return schedule */
@@ -309,10 +298,6 @@ void silc_fd_stream_notifier(SilcStream stream,
 SilcSchedule silc_fd_stream_get_schedule(SilcStream stream)
 {
   SilcFDStream fd_stream = stream;
-
-  if (!SILC_IS_FD_STREAM(fd_stream))
-    return NULL;
-
   return fd_stream->schedule;
 }