Changeset c2fb3809 for protocols/jabber

Timestamp:

2007-04-15T22:39:35Z (18 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

84b045d

Parents:

cd4723c

Message:

Cleaned up struct im_connection. No more username/password stuff since
it's in acc too. wants_to_die is now an argument to imc_logout().

Location:

protocols/jabber

Files:

• io.c (modified) (14 diffs)
• iq.c (modified) (5 diffs)
• jabber.c (modified) (3 diffs)
• sasl.c (modified) (5 diffs)

protocols/jabber/io.c

@@ -118 +118 @@
                 
                 imc_error( ic, "Short write() to server" );
-                imc_logout( ic );
+                imc_logout( ic, TRUE );
                 return FALSE;
         }
@@ -161 +161 @@
                 {
                         imc_error( ic, "XML stream error" );
-                        imc_logout( ic );
+                        imc_logout( ic, TRUE );
                         return FALSE;
                 }
@@ -205 +205 @@
                                                 imc_error( ic, "TLS is turned on for this "
                                                           "account, but is not supported by this server" );
-                                                imc_logout( ic );
+                                                imc_logout( ic, FALSE );
                                                 return FALSE;
                                         }
@@ -217 +217 @@
                         {
                                 imc_error( ic, "XML stream error" );
-                                imc_logout( ic );
+                                imc_logout( ic, TRUE );
                                 return FALSE;
                         }
@@ -228 +228 @@
                 
                 imc_error( ic, "Error while reading from server" );
-                imc_logout( ic );
+                imc_logout( ic, TRUE );
                 return FALSE;
         }
@@ -243 +243 @@
         {
                 imc_error( ic, "Could not connect to server" );
-                imc_logout( ic );
+                imc_logout( ic, TRUE );
                 return FALSE;
         }
@@ -264 +264 @@
                 
                 imc_error( ic, "Could not connect to server" );
-                imc_logout( ic );
+                imc_logout( ic, TRUE );
                 return FALSE;
         }
@@ -275 +275 @@
 static xt_status jabber_end_of_stream( struct xt_node *node, gpointer data )
 {
-        imc_logout( data );
+        imc_logout( data, TRUE );
         return XT_ABORT;
 }
@@ -298 +298 @@
                 {
                         imc_error( ic, "Server requires TLS connections, but TLS is turned off for this account" );
-                        imc_logout( ic );
+                        imc_logout( ic, FALSE );
                         
                         return XT_ABORT;
@@ -328 +328 @@
                 {
                         imc_error( ic, "TLS is turned on for this account, but is not supported by this server" );
-                        imc_logout( ic );
+                        imc_logout( ic, FALSE );
                         
                         return XT_ABORT;
@@ -429 +429 @@
         struct xt_node *c;
         char *s, *type = NULL, *text = NULL;
+        int allow_reconnect = TRUE;
         
         for( c = node->children; c; c = c->next )
@@ -453 +454 @@
         {
                 imc_error( ic, "Unknown stream error reported by server" );
-                imc_logout( ic );
+                imc_logout( ic, allow_reconnect );
                 return XT_ABORT;
         }
@@ -463 +464 @@
         {
                 imc_error( ic, "Account and resource used from a different location" );
-                ic->wants_to_die = TRUE;
+                allow_reconnect = FALSE;
         }
         else
@@ -470 +471 @@
         }
         
-        imc_logout( ic );
+        imc_logout( ic, allow_reconnect );
         
         return XT_ABORT;

protocols/jabber/iq.c

@@ -40 +40 @@
         {
                 imc_error( ic, "Received IQ packet without type." );
-                imc_logout( ic );
+                imc_logout( ic, TRUE );
                 return XT_ABORT;
         }
@@ -220 +220 @@
         {
                 imc_log( ic, "WARNING: Received incomplete IQ packet while authenticating" );
-                imc_logout( ic );
+                imc_logout( ic, FALSE );
                 return XT_HANDLED;
         }
@@ -259 +259 @@
                 
                 imc_error( ic, "Can't find suitable authentication method" );
-                imc_logout( ic );
+                imc_logout( ic, FALSE );
                 return XT_ABORT;
         }
@@ -278 +278 @@
         {
                 imc_log( ic, "WARNING: Received incomplete IQ packet while authenticating" );
-                imc_logout( ic );
+                imc_logout( ic, FALSE );
                 return XT_HANDLED;
         }
@@ -285 +285 @@
         {
                 imc_error( ic, "Authentication failure" );
-                imc_logout( ic );
+                imc_logout( ic, FALSE );
                 return XT_ABORT;
         }

protocols/jabber/jabber.c

@@ -73 +73 @@
         {
                 imc_error( ic, "Incomplete account name (format it like <username@jabberserver.name>)" );
-                imc_logout( ic );
+                imc_logout( ic, FALSE );
                 return;
         }
@@ -166 +166 @@
                 imc_log( ic, "Incorrect port number, must be in the %d-%d range",
                                JABBER_PORT_MIN, JABBER_PORT_MAX );
-                imc_logout( ic );
+                imc_logout( ic, FALSE );
                 return;
         }
@@ -187 +187 @@
         {
                 imc_error( ic, "Could not connect to server" );
-                imc_logout( ic );
+                imc_logout( ic, TRUE );
         }
 }

protocols/jabber/sasl.c

@@ -45 +45 @@
         if( !s || strcmp( s, XMLNS_SASL ) != 0 )
         {
-                imc_logout( ic );
+                imc_log( ic, "Stream error while authenticating" );
+                imc_logout( ic, FALSE );
                 return XT_ABORT;
         }
@@ -63 +64 @@
         {
                 imc_error( ic, "No known SASL authentication schemes supported" );
-                imc_logout( ic );
+                imc_logout( ic, FALSE );
                 return XT_ABORT;
         }
@@ -280 +281 @@
 error:
         imc_error( ic, "Incorrect SASL challenge received" );
-        imc_logout( ic );
+        imc_logout( ic, FALSE );
 
 silent_error:
@@ -303 +304 @@
         if( !s || strcmp( s, XMLNS_SASL ) != 0 )
         {
-                imc_logout( ic );
+                imc_log( ic, "Stream error while authenticating" );
+                imc_logout( ic, FALSE );
                 return XT_ABORT;
         }
@@ -315 +317 @@
         {
                 imc_error( ic, "Authentication failure" );
-                imc_logout( ic );
+                imc_logout( ic, FALSE );
                 return XT_ABORT;
         }