silc_stream_set_notifier and silc_schedule_set_listen_fd now

[silc.git] / lib / silcutil / unix / silcunixsocketstream.c

diff --git a/lib/silcutil/unix/silcunixsocketstream.c b/lib/silcutil/unix/silcunixsocketstream.c
index 1b9d66295036a22721ed963d1e44d262aed27bd4..a50f3e464b44c9e3e26ff5a0c45ca892ffbdef5d 100644 (file)
--- a/lib/silcutil/unix/silcunixsocketstream.c
+++ b/lib/silcutil/unix/silcunixsocketstream.c
@@ -253,11 +253,8 @@ SilcBool silc_socket_stream_close(SilcStream stream)
 {
   SilcSocketStream socket_stream = stream;
 
-  if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
-      !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
-    return FALSE;
-
   silc_schedule_unset_listen_fd(socket_stream->schedule, socket_stream->sock);
+  silc_schedule_task_del_by_fd(socket_stream->schedule, socket_stream->sock);
   silc_net_close_connection(socket_stream->sock);
 
   return TRUE;
@@ -269,10 +266,6 @@ void silc_socket_stream_destroy(SilcStream stream)
 {
   SilcSocketStream socket_stream = stream;
 
-  if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
-      !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
-    return;
-
   silc_socket_stream_close(socket_stream);
   silc_free(socket_stream->ip);
   silc_free(socket_stream->hostname);
@@ -298,17 +291,13 @@ void silc_socket_stream_destroy(SilcStream stream)
 
 /* Sets stream notification callback for the stream */
 
-void silc_socket_stream_notifier(SilcStream stream,
-                                SilcSchedule schedule,
-                                SilcStreamNotifier callback,
-                                void *context)
+SilcBool silc_socket_stream_notifier(SilcStream stream,
+                                    SilcSchedule schedule,
+                                    SilcStreamNotifier callback,
+                                    void *context)
 {
   SilcSocketStream socket_stream = stream;
 
-  if (!SILC_IS_SOCKET_STREAM(socket_stream) &&
-      !SILC_IS_SOCKET_STREAM_UDP(socket_stream))
-    return;
-
   SILC_LOG_DEBUG(("Setting stream notifier callback"));
 
   socket_stream->notifier = callback;
@@ -317,19 +306,24 @@ void silc_socket_stream_notifier(SilcStream stream,
 
   if (socket_stream->notifier) {
     /* Add the socket to scheduler.  Safe to call if already added. */
-    silc_schedule_task_add_fd(socket_stream->schedule, socket_stream->sock,
-                             silc_socket_stream_io, socket_stream);
+    if (!silc_schedule_task_add_fd(socket_stream->schedule,
+                                  socket_stream->sock,
+                                  silc_socket_stream_io, socket_stream))
+      return FALSE;
 
     /* Initially set socket for reading */
-    silc_schedule_set_listen_fd(socket_stream->schedule, socket_stream->sock,
-                               SILC_TASK_READ, FALSE);
-    silc_schedule_wakeup(socket_stream->schedule);
+    if (!silc_schedule_set_listen_fd(socket_stream->schedule,
+                                    socket_stream->sock,
+                                    SILC_TASK_READ, FALSE))
+      return FALSE;
   } else {
     /* Unschedule the socket */
     silc_schedule_unset_listen_fd(socket_stream->schedule,
                                  socket_stream->sock);
     silc_schedule_task_del_by_fd(socket_stream->schedule,
                                 socket_stream->sock);
-    silc_schedule_wakeup(socket_stream->schedule);
   }
+
+  silc_schedule_wakeup(socket_stream->schedule);
+  return TRUE;
 }