Changeset 2503

Timestamp:

07/26/07 10:49:35

Author:

pvanhoof

Message:

Several fixes in the POP code

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c (modified) (7 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c (modified) (15 diffs)

trunk/ChangeLog

@@ +1 @@
+2007-07-26  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * More granularity in the locking of the POP code
+        * Several fixes in the POP code
+
-2007-07-25  Philip Van Hoof  <pvanhoof@gnome.org>
-

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c

@@ -96 +96 @@
-                for (i=0;i<pop3_folder->uids->len;i++,fi++) {
-                        if (fi[0]->cmd) {
+
+                                g_static_rec_mutex_lock (pop3_store->eng_lock);
+
+                                if (pop3_store->engine == NULL) {
+                                        g_ptr_array_free(pop3_folder->uids, TRUE);
+                                        g_hash_table_destroy(pop3_folder->uids_uid);
+                                        g_free(fi[0]->uid);
+                                        g_free(fi[0]);
+                                        g_static_rec_mutex_unlock (pop3_store->eng_lock);
+                                        return;
+                                }
+
-                                while (camel_pop3_engine_iterate(pop3_store->engine, fi[0]->cmd) > 0)
-                                        ;
-                                camel_pop3_engine_command_free(pop3_store->engine, fi[0]->cmd);
+
+                                g_static_rec_mutex_unlock (pop3_store->eng_lock);
-                        }
-                        
@@ -516 +530 @@
-
-        if (!expunge) {
+                camel_service_disconnect (CAMEL_SERVICE (pop3_store), TRUE, &dex);
-                g_static_rec_mutex_unlock (pop3_store->eng_lock);
-                camel_service_disconnect (CAMEL_SERVICE (pop3_store), TRUE, &dex);
-                return;
-        }
@@ -957 +971 @@
-
-                g_static_rec_mutex_lock (pop3_store->eng_lock);
+
+                if (pop3_store->engine == NULL) {
+                        g_static_rec_mutex_unlock (pop3_store->eng_lock);
+                        goto fail;
+                }
+
-                while ((i = camel_pop3_engine_iterate(pop3_store->engine, fi->cmd)) > 0)
-                        ;
+
-                g_static_rec_mutex_unlock (pop3_store->eng_lock);
-
@@ -965 +986 @@
-
-                /* getting error code? */
-g_assert (fi->cmd->state == CAMEL_POP3_COMMAND_DATA);
+ g_assert (fi->cmd->state == CAMEL_POP3_COMMAND_DATA); 
-
-                g_static_rec_mutex_lock (pop3_store->eng_lock);
@@ -1100 +1121 @@
-                        while (camel_pop3_engine_iterate(pop3_store->engine, cmd) > 0);
-                        camel_pop3_engine_command_free(pop3_store->engine, cmd);
+
-                        g_static_rec_mutex_unlock (pop3_store->eng_lock);
-                }
@@ -1259 +1281 @@
-                        fi->err = errno;
-                camel_pop3_engine_command_free(pop3_store->engine, pcr);
+
-                g_static_rec_mutex_unlock (pop3_store->eng_lock);
-
@@ -1408 +1431 @@
-                camel_folder_change_info_remove_uid (changes, uids->pdata[i]);
-                /* We intentionally don't remove it from the cache because
-
-
+
-        }
-        camel_folder_summary_save (folder->summary);

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c

@@ -331 +331 @@
-                store->delete_after =  atoi(delete_days);
-
-
+
+
-        if (!(store->engine = camel_pop3_engine_new (tcp_stream, flags))) {
-                camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
@@ -337 +338 @@
-                        service->url->host);
-                camel_object_unref (tcp_stream);
-
+
+
+
-                return FALSE;
-        }
-        store->engine->store = store;
-        store->engine->partial_happening = FALSE;
+
+#ifndef HAVE_SSL /* ! */
-        g_static_rec_mutex_unlock (store->eng_lock);
+#endif
-
-        if (!must_tls && (ssl_mode != MODE_TLS)) 
@@ -348 +354 @@
-                camel_object_unref (tcp_stream);
-                store->connected = TRUE;
+
+#ifdef HAVE_SSL /* ! */
+                g_static_rec_mutex_unlock (store->eng_lock);
+#endif
+
-                return TRUE;
-        }
@@ -405 +416 @@
-        store->connected = TRUE;
-
+        g_static_rec_mutex_unlock (store->eng_lock); /* ! */
+
-        return TRUE;
-
- stls_exception:
+
+
-        if (clean_quit) 
-        {
@@ -417 +432 @@
-        }
-
-        g_static_rec_mutex_lock (store->eng_lock);
-        camel_object_unref (CAMEL_OBJECT (store->engine));
-        camel_object_unref (CAMEL_OBJECT (tcp_stream));
-        store->engine = NULL;
-        store->connected = FALSE;
-
+
+
-
-        return FALSE;
@@ -500 +515 @@
-        GList *types = NULL;
-
-        
+       
-        if (camel_exception_is_set (ex))
-                return NULL;
-
-        if (connect_to_server_wrapper (service, NULL)) {
+
+                g_static_rec_mutex_lock (store->eng_lock);
+
+                if (store->engine == NULL) {
+                        g_static_rec_mutex_unlock (store->eng_lock);
+                        return NULL;
+                }
+
-                types = g_list_concat(types, g_list_copy(store->engine->auth));
+                g_static_rec_mutex_unlock (store->eng_lock);
+
-                pop3_disconnect (service, TRUE, NULL);
-        } else {
@@ -614 +639 @@
-
-        if (!service->url->authmech) {
+
+                g_static_rec_mutex_lock (store->eng_lock);
+
+                if (store->engine == NULL) {
+                        g_static_rec_mutex_unlock (store->eng_lock);
+                        return FALSE;
+                }
+
-                /* pop engine will take care of pipelining ability */
-                pcu = camel_pop3_engine_command_new(store->engine, 0, NULL, NULL, "USER %s\r\n", service->url->user);
-                pcp = camel_pop3_engine_command_new(store->engine, 0, NULL, NULL, "PASS %s\r\n", service->url->passwd);
+
+                g_static_rec_mutex_unlock (store->eng_lock);
+
-        } else if (strcmp(service->url->authmech, "+APOP") == 0 && store->engine->apop) {
-                char *secret, md5asc[33], *d;
@@ -635 +671 @@
-                        d++;
-                }
-
+
+
+
+
+
+
+
+
-                secret = g_alloca(strlen(store->engine->apop)+strlen(service->url->passwd)+1);
-                sprintf(secret, "%s%s",  store->engine->apop, service->url->passwd);
@@ -642 +685 @@
-                for (s = md5sum, d = md5asc; d < md5asc + 32; s++, d += 2)
-                        sprintf (d, "%.2x", *s);
-
+
-                pcp = camel_pop3_engine_command_new(store->engine, 0, NULL, NULL, "APOP %s %s\r\n",
-                                                    service->url->user, md5asc);
+
+                g_static_rec_mutex_unlock (store->eng_lock);
+
-        } else {
-                CamelServiceAuthType *auth;
-                GList *l;
-
+                g_static_rec_mutex_lock (store->eng_lock);
+
+                if (store->engine == NULL) {
+                        g_static_rec_mutex_unlock (store->eng_lock);
+                        return FALSE;
+                }
+
-                l = store->engine->auth;
-                while (l) {
-                        auth = l->data;
-
+
+
-                                return try_sasl(store, service->url->authmech, ex) == -1;
+                        }
-                        l = l->next;
-                }
-
+
+
+
-                camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_URL_INVALID,
-                                      _("Unable to connect to POP server %s: "
@@ -663 +720 @@
-                return FALSE;
-        }
-
+
+
+
+
+
+
+
+
-        while ((status = camel_pop3_engine_iterate(store->engine, pcp)) > 0)
-                ;
-
+
+
-        if (status == -1) {
-                if (errno == EINTR) {
@@ -689 +754 @@
-                                      CAMEL_SERVICE (store)->url->host,
-                                      store->engine->line ? (char *)store->engine->line : _("Unknown error"));
-
-
+
+ 
-        
-        if (pcu)
-                camel_pop3_engine_command_free(store->engine, pcu);
-
+
+
+
-        return status;
-}
@@ -706 +773 @@
-        char *errbuf = NULL;
-        int status;
-
+
-        session = camel_service_get_session (service);
-
@@ -737 +804 @@
-        
-        /* Now that we are in the TRANSACTION state, try regetting the capabilities */
+
+        g_static_rec_mutex_lock (store->eng_lock);
+
+        if (store->engine == NULL) {
+                g_static_rec_mutex_unlock (store->eng_lock);
+                return FALSE;
+        }
+
-        store->engine->state = CAMEL_POP3_ENGINE_TRANSACTION;
-        camel_pop3_engine_reget_capabilities (store->engine);
-
+
+
+
-        return TRUE;
-}
@@ -747 +824 @@
-{
-        CamelPOP3Store *store = CAMEL_POP3_STORE (service);
-
+
+
+
+
+
+
+
-        if (clean) {
-                CamelPOP3Command *pc;
@@ -757 +840 @@
-        }
-
-        g_static_rec_mutex_lock (store->eng_lock);
-        camel_object_unref((CamelObject *)store->engine);
-        store->engine = NULL;