Changeset 4938:0bb4645e994b for imap

Timestamp:

2007-02-28 09:47:13 (21 months ago)

Author:

Brendan Cully <brendan@…>

Branch:

HEAD

Message:

Add imap_close_connection to fully reset IMAP state. (closes: #2717)
Thanks to Sergey Svishchev for the original patch.

Location:

imap

Files:

• command.c (modified) (1 diff)
• imap.c (modified) (2 diffs)
• imap_private.h (modified) (1 diff)

imap/command.c

@@ -376 +376 @@
 
   if (idata->state < IMAP_SELECTED)
-  {
-    idata->state = IMAP_DISCONNECTED;
-    mutt_socket_close (idata->conn);
-    idata->status = 0;
-  }
+    imap_close_connection (idata);
 }
 

imap/imap.c

@@ -400 +400 @@
   if (imap_cmd_step (idata) != IMAP_CMD_CONTINUE)
   {
-    mutt_socket_close (idata->conn);
-    idata->state = IMAP_DISCONNECTED;
+    imap_close_connection (idata);
     return -1;
   }
@@ -468 +467 @@
 #if defined(USE_SSL)
  err_close_conn:
-  mutt_socket_close (idata->conn);
-  idata->state = IMAP_DISCONNECTED;
+  imap_close_connection (idata);
 #endif
  bail:
   FREE (&idata->capstr);
   return -1;
+}
+
+void imap_close_connection(IMAP_DATA* idata)
+{
+  mutt_socket_close (idata->conn);
+  idata->state = IMAP_DISCONNECTED;
+  idata->seqno = idata->nextcmd = idata->lastcmd = idata->status = 0;
+  memset (idata->cmds, 0, sizeof (IMAP_COMMAND) * IMAP_PIPELINE_DEPTH);
 }
 

imap/imap_private.h

@@ -236 +236 @@
                        int invert);
 int imap_open_connection (IMAP_DATA* idata);
+void imap_close_connection (IMAP_DATA* idata);
 IMAP_DATA* imap_conn_find (const ACCOUNT* account, int flags);
 int imap_read_literal (FILE* fp, IMAP_DATA* idata, long bytes, progress_t*);