Changeset bc090f0

Timestamp:

2010-03-20T22:42:59Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

ee6cc94

Parents:

ffb6dea

Message:

Error reporting and added a msgq_send function. Need to put some more
intelligence into it later.

Location:

protocols/msn

Files:

• sb.c (modified) (1 diff)
• soap.c (modified) (5 diffs)
• soap.h (modified) (1 diff)

protocols/msn/sb.c

@@ -607 +607 @@
                 const struct msn_status_code *err = msn_status_by_number( num );
                 
+                /* If the person is offline, send an offline message instead,
+                   and don't report an error. */
                 if( num == 217 )
-                {
-                        GSList *l;
-                        
-                        for( l = sb->msgq; l; l = l->next )
-                        {
-                                struct msn_message *m = l->data;
-                                msn_soap_oim_send( ic, m->who, m->text );
-                        }
-                }
-                
-                imcb_error( ic, "Error reported by switchboard server: %s", err->text );
+                        msn_soap_oim_send_queue( ic, &sb->msgq );
+                else
+                        imcb_error( ic, "Error reported by switchboard server: %s", err->text );
                 
                 if( err->flags & STATUS_SB_FATAL )

protocols/msn/soap.c

@@ -57 +57 @@
 };
 
-struct msn_soap_oim_send_data
-{
-        char *to;
-        char *msg;
-        int number;
-        int need_retry;
-};
-
 static int msn_soap_send_request( struct msn_soap_req_data *req );
 
@@ -139 +131 @@
 }
 
+
+/* oim_send: Sending offline messages */
+
+struct msn_soap_oim_send_data
+{
+        char *to;
+        char *msg;
+        int number;
+        int need_retry;
+};
+
 static int msn_soap_oim_build_request( struct msn_soap_req_data *soap_req )
 {
@@ -183 +186 @@
         struct msn_soap_oim_send_data *oim = soap_req->data;
         
-        if( soap_req->http_req->status_code == 500 && oim->need_retry )
+        if( soap_req->http_req->status_code == 500 && oim->need_retry && soap_req->ttl > 0 )
         {
                 oim->need_retry = 0;
@@ -189 +192 @@
         }
         else if( soap_req->http_req->status_code == 200 )
+        {
+                imcb_log( soap_req->ic, "Offline message successfully delivered to %s", oim->to );
                 return MSN_SOAP_OK;
+        }
         else
+        {
+                imcb_log( soap_req->ic, "Failed to deliver offline message to %s:\n%s", oim->to, oim->msg );
                 return MSN_SOAP_ABORT;
+        }
 }
 
@@ -219 +228 @@
                                          msn_soap_oim_free_data );
 }
+
+int msn_soap_oim_send_queue( struct im_connection *ic, GSList **msgq )
+{
+        GSList *l;
+        char *n = NULL;
+        
+        for( l = *msgq; l; l = l->next )
+        {
+                struct msn_message *m = l->data;
+                
+                if( n == NULL )
+                        n = m->who;
+                if( strcmp( n, m->who ) == 0 )
+                        msn_soap_oim_send( ic, m->who, m->text );
+        }
+        
+        while( *msgq != NULL )
+        {
+                struct msn_message *m = (*msgq)->data;
+                
+                g_free( m->who );
+                g_free( m->text );
+                g_free( m );
+                
+                *msgq = g_slist_remove( *msgq, m );
+        }
+}

protocols/msn/soap.h

@@ -83 +83 @@
 
 int msn_soap_oim_send( struct im_connection *ic, const char *to, const char *msg );
+int msn_soap_oim_send_queue( struct im_connection *ic, GSList **msgq );
 
 #endif /* __SOAP_H__ */