ssl cleanups

Author: pjstevns

src/clientbase.c

@@ -37,24 +37,8 @@ extern SSL_CTX *tls_context;
 static void dm_tls_error(void)
 {
 	unsigned long e;
-	e = ERR_get_error();
-	if (e == 0) {
-		if (errno != 0) {
-			int se = errno;
-			switch (se) {
-				case EAGAIN:
-				case EINTR:
-					break;
-				default:
-					TRACE(TRACE_INFO, "%s", strerror(se));
-				break;
-			}
-		} else {
-			TRACE(TRACE_INFO, "Unknown error");
-		}
-		return;
-	}
-	TRACE(TRACE_INFO, "%s", ERR_error_string(e, NULL));
+	while ((e = ERR_get_error()))
+		TRACE(TRACE_INFO, "%s", ERR_error_string(e, NULL));
 }
 
 size_t client_wbuf_len(ClientBase_T *client)
@@ -368,13 +352,6 @@ void ci_read_cb(ClientBase_T *client)
 	int64_t t = 0;
 	char ibuf[IBUFLEN];
 
-	TRACE(TRACE_DEBUG,"[%p] reset timeout [%ld]", client, client->timeout->tv_sec); 
-
-	if (client->sock->ssl && client->sock->ssl_state == FALSE) {
-		ci_starttls(client);
-		return;
-	}
-
 	while (TRUE) {
 		memset(ibuf, 0, sizeof(ibuf));
 		if (client->sock->ssl) {

src/imap4.c

@@ -131,6 +131,7 @@ const IMAP_COMMAND_HANDLER imap_handler_functions[] = {
 static int imap4_tokenizer(ImapSession *, char *);
 static int imap4(ImapSession *);
 static void imap_handle_input(ImapSession *);
+static void imap_handle_abort(ImapSession *);
 
 void imap_cleanup_deferred(gpointer data)
 {
@@ -189,9 +190,11 @@ void socket_write_cb(int UNUSED fd, short UNUSED what, void *arg)
 		case CLIENTSTATE_QUIT_QUEUED:
 			break; // ignore
 		case CLIENTSTATE_LOGOUT:
-		case CLIENTSTATE_ERROR:
 			imap_session_bailout(session);
 			break;
+		case CLIENTSTATE_ERROR:
+			imap_handle_abort(session);
+			break;
 		default:
 			ci_write_cb(session->ci);
 			break;
@@ -213,8 +216,7 @@ void imap_cb_read(void *arg)
 	TRACE(TRACE_DEBUG,"state [%d] enough %d: %" PRIu64 "/%" PRIu64 "", state, enough, have, need);
 
 	if (state & CLIENT_ERR) {
-		dbmail_imap_session_set_state(session,CLIENTSTATE_ERROR);
-		imap_session_bailout(session);
+		imap_handle_abort(session);
 	} else if (state & CLIENT_EOF) {
 		ci_cork(session->ci);
 		if (enough)
@@ -275,29 +277,29 @@ static void imap_session_reset(ImapSession *session)
  * only the main thread may write to the network event
  * worker threads must use an async queue
  */
-static int64_t imap_session_printf(ImapSession * self, char * message, ...)
+static int64_t imap_session_printf(ImapSession * session, char * message, ...)
 {
         va_list ap, cp;
         uint64_t l;
 	int e = 0;
 
-	p_string_truncate(self->buff, 0);
+	p_string_truncate(session->buff, 0);
 
         assert(message);
         va_start(ap, message);
 	va_copy(cp, ap);
-        p_string_append_vprintf(self->buff, message, cp);
+        p_string_append_vprintf(session->buff, message, cp);
         va_end(cp);
         va_end(ap);
 
-	if ((e = ci_write(self->ci, (char *)p_string_str(self->buff))) < 0) {
+	if ((e = ci_write(session->ci, (char *)p_string_str(session->buff))) < 0) {
 		TRACE(TRACE_DEBUG, "ci_write failed [%s]", strerror(e));
-		dbmail_imap_session_set_state(self,CLIENTSTATE_ERROR);
+		imap_handle_abort(session);
 		return e;
 	}
 
-        l = p_string_len(self->buff);
-	p_string_truncate(self->buff, 0);
+        l = p_string_len(session->buff);
+	p_string_truncate(session->buff, 0);
 
         return (int64_t)l;
 }
@@ -360,7 +362,7 @@ static int checktag(const char *s)
 	return 1;
 }
 
-static void imap_handle_abort(ImapSession *session)
+void imap_handle_abort(ImapSession *session)
 {
 	dbmail_imap_session_set_state(session,CLIENTSTATE_ERROR);	/* fatal error occurred, kick this user */
 	imap_session_reset(session);
@@ -375,7 +377,7 @@ static void imap_handle_continue(ImapSession *session)
 			if ((e = ci_write(session->ci, (char *)p_string_str(session->buff))) < 0) {
 				int serr = errno;
 				TRACE(TRACE_DEBUG,"ci_write returned error [%s]", strerror(serr));
-				dbmail_imap_session_set_state(session,CLIENTSTATE_ERROR);
+				imap_handle_abort(session);
 				return;
 			}
 			dbmail_imap_session_buff_clear(session);
@@ -493,8 +495,8 @@ void imap_handle_input(ImapSession *session)
 		if (l == 0) break; // done
 
 		if (session->error_count >= MAX_FAULTY_RESPONSES) {
-			dbmail_imap_session_set_state(session,CLIENTSTATE_ERROR);
 			imap_session_printf(session, "* BYE [TRY RFC]\r\n");
+			imap_handle_abort(session);
 			break;
 		}
 
@@ -660,7 +662,7 @@ void _ic_cb_leave(gpointer data)
 			);
 
 	if (state & CLIENT_ERR) {
-		dbmail_imap_session_set_state(session,CLIENTSTATE_ERROR);
+		imap_handle_abort(session);
 		return;
 	} 
 
@@ -710,7 +712,7 @@ int imap4(ImapSession *session)
 	int j = 0;
 
 	if (! dm_db_ping()) {
-		dbmail_imap_session_set_state(session,CLIENTSTATE_ERROR);
+		imap_handle_abort(session);
 		return DM_EQUERY;
 	}