Changeset d52111a

Timestamp:

2007-12-12T21:36:33Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

30ce1ce

Parents:

0f47613

Message:

Fixed sockerr_again() usage in Jabber module to (hopefully) fix a 100% CPU
usage bug.

Files:

• lib/misc.c (modified) (2 diffs)
• lib/misc.h (modified) (1 diff)
• protocols/jabber/io.c (modified) (2 diffs)

lib/misc.c

@@ -44 +44 @@
 #include <resolv.h>
 #endif
+
+#include "ssl_client.h"
 
 void strip_linefeed(gchar *text)
@@ -591 +593 @@
         return g_string_free( ret, FALSE );
 }
+
+gboolean ssl_sockerr_again( void *ssl )
+{
+        if( ssl )
+                return ssl_errno == SSL_AGAIN;
+        else
+                return sockerr_again();
+}

lib/misc.h

@@ -66 +66 @@
 G_MODULE_EXPORT char *word_wrap( char *msg, int line_len );
 
+G_MODULE_EXPORT gboolean ssl_sockerr_again( void *ssl );
+
 #endif

protocols/jabber/io.c

@@ -120 +120 @@
                 return TRUE;
         }
-        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
+        else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) )
         {
                 /* Set fd to -1 to make sure we won't write to it anymore. */
@@ -231 +231 @@
                 }
         }
-        else if( st == 0 || ( st < 0 && !sockerr_again() ) )
+        else if( st == 0 || ( st < 0 && !ssl_sockerr_again( jd->ssl ) ) )
         {
                 closesocket( jd->fd );