silc_compare_timeval returns < 0, 0, > 0 instead of TRUE/FALSE.

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

diff --git a/lib/silcutil/unix/silcunixsocketstream.c b/lib/silcutil/unix/silcunixsocketstream.c
index a50f3e464b44c9e3e26ff5a0c45ca892ffbdef5d..f3107f39c36a1044401de229ea04a69de7fe01c7 100644 (file)
--- a/lib/silcutil/unix/silcunixsocketstream.c
+++ b/lib/silcutil/unix/silcunixsocketstream.c
@@ -80,6 +80,8 @@ int silc_socket_stream_read(SilcStream stream, unsigned char *buf,
       if (errno == EAGAIN || errno == EINTR) {
        SILC_LOG_DEBUG(("Could not read immediately, will do it later"));
        silc_schedule_set_listen_fd(sock->schedule, sock->sock,
+                                   silc_schedule_get_fd_events(sock->schedule,
+                                                               sock->sock) |
                                    SILC_TASK_READ, FALSE);
        return -1;
       }
@@ -122,6 +124,8 @@ int silc_socket_stream_read(SilcStream stream, unsigned char *buf,
     if (errno == EAGAIN || errno == EINTR) {
       SILC_LOG_DEBUG(("Could not read immediately, will do it later"));
       silc_schedule_set_listen_fd(sock->schedule, sock->sock,
+                                 silc_schedule_get_fd_events(sock->schedule,
+                                                             sock->sock) |
                                  SILC_TASK_READ, FALSE);
       return -1;
     }
@@ -146,7 +150,7 @@ int silc_socket_stream_read(SilcStream stream, unsigned char *buf,
   /* If we have passed the rate time limit, set our new time limit,
      and zero the rate limit.  This limits reads per second. */
   silc_gettimeofday(&curtime);
-  if (!silc_compare_timeval(&curtime, &sock->qos->next_limit)) {
+  if (silc_compare_timeval(&curtime, &sock->qos->next_limit) > 0) {
     curtime.tv_sec++;
     sock->qos->next_limit = curtime;
     sock->qos->cur_rate = 0;
@@ -245,7 +249,7 @@ SilcBool silc_socket_get_error(SilcStream sock, char *error,
   memcpy(error, err, strlen(err));
   return TRUE;
 }
-#endif /* 0 */
+#endif
 
 /* Closes socket */
 
@@ -253,8 +257,12 @@ SilcBool silc_socket_stream_close(SilcStream stream)
 {
   SilcSocketStream socket_stream = stream;
 
-  silc_schedule_unset_listen_fd(socket_stream->schedule, socket_stream->sock);
-  silc_schedule_task_del_by_fd(socket_stream->schedule, socket_stream->sock);
+  if (socket_stream->schedule) {
+    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;
@@ -304,7 +312,7 @@ SilcBool silc_socket_stream_notifier(SilcStream stream,
   socket_stream->notifier_context = context;
   socket_stream->schedule = schedule;
 
-  if (socket_stream->notifier) {
+  if (socket_stream->notifier && socket_stream->schedule) {
     /* Add the socket to scheduler.  Safe to call if already added. */
     if (!silc_schedule_task_add_fd(socket_stream->schedule,
                                   socket_stream->sock,
@@ -316,7 +324,7 @@ SilcBool silc_socket_stream_notifier(SilcStream stream,
                                     socket_stream->sock,
                                     SILC_TASK_READ, FALSE))
       return FALSE;
-  } else {
+  } else if (socket_stream->schedule) {
     /* Unschedule the socket */
     silc_schedule_unset_listen_fd(socket_stream->schedule,
                                  socket_stream->sock);
@@ -324,6 +332,8 @@ SilcBool silc_socket_stream_notifier(SilcStream stream,
                                 socket_stream->sock);
   }
 
-  silc_schedule_wakeup(socket_stream->schedule);
+  if (socket_stream->schedule)
+    silc_schedule_wakeup(socket_stream->schedule);
+
   return TRUE;
 }