From ff5c0a4eae024bc305a8d73aefb25e978f36b1e0 Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Tue, 12 Jun 2018 23:22:59 +0200
Subject: [PATCH] remove unneeded locking in smpt-thread

---
 src/mrsmtp.c | 26 +++-----------------------
 src/mrsmtp.h |  1 -
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/mrsmtp.c b/src/mrsmtp.c
index dbc133c5..6512e75f 100644
--- a/src/mrsmtp.c
+++ b/src/mrsmtp.c
@@ -30,10 +30,6 @@
 #endif
 
 
-#define LOCK_SMTP   pthread_mutex_lock(&ths->m_mutex); smtp_locked = 1;
-#define UNLOCK_SMTP if( smtp_locked ) { pthread_mutex_unlock(&ths->m_mutex); smtp_locked = 0; }
-
-
 /*******************************************************************************
  * Main interface
  ******************************************************************************/
@@ -49,7 +45,6 @@ mrsmtp_t* mrsmtp_new(mrmailbox_t* mailbox)
 	ths->m_log_connect_errors = 1;
 
 	ths->m_mailbox = mailbox; /* should be used for logging only */
-	pthread_mutex_init(&ths->m_mutex, NULL);
 	return ths;
 }
 
@@ -60,7 +55,6 @@ void mrsmtp_unref(mrsmtp_t* ths)
 		return;
 	}
 	mrsmtp_disconnect(ths);
-	pthread_mutex_destroy(&ths->m_mutex);
 	free(ths->m_from);
 	free(ths);
 }
@@ -98,15 +92,13 @@ static void logger(mailsmtp* smtp, int log_type, const char* buffer__, size_t si
 
 int mrsmtp_connect(mrsmtp_t* ths, const mrloginparam_t* lp)
 {
-	int         success = 0, smtp_locked = 0;
+	int         success = 0;
 	int         r, try_esmtp;
 
 	if( ths == NULL || lp == NULL ) {
 		return 0;
 	}
 
-	LOCK_SMTP
-
 		if( ths->m_mailbox->m_cb(ths->m_mailbox, MR_EVENT_IS_OFFLINE, 0, 0)!=0 ) {
 			mrmailbox_log_error_if(&ths->m_log_connect_errors, ths->m_mailbox, MR_ERR_NONETWORK, NULL);
 			goto cleanup;
@@ -199,7 +191,7 @@ int mrsmtp_connect(mrsmtp_t* ths, const mrloginparam_t* lp)
 		if( lp->m_send_user )
 		{
 				if((r=mailsmtp_auth(ths->m_hEtpan, lp->m_send_user, lp->m_send_pw))!=MAILSMTP_NO_ERROR ) {
-					/* 
+					/*
 					 * There are some Mailservers which do not correclty implement PLAIN auth (hMail)
 					 * So here we try a workaround. See https://github.com/deltachat/deltachat-android/issues/67
 					 */
@@ -235,29 +227,21 @@ cleanup:
 			}
 		}
 
-	UNLOCK_SMTP
-
 	return success;
 }
 
 
 void mrsmtp_disconnect(mrsmtp_t* ths)
 {
-	int smtp_locked = 0;
-
 	if( ths == NULL ) {
 		return;
 	}
 
-	LOCK_SMTP
-
 		if( ths->m_hEtpan ) {
 			//mailsmtp_quit(ths->m_hEtpan); -- ?
 			mailsmtp_free(ths->m_hEtpan);
 			ths->m_hEtpan = NULL;
 		}
-
-	UNLOCK_SMTP
 }
 
 
@@ -268,7 +252,7 @@ void mrsmtp_disconnect(mrsmtp_t* ths)
 
 int mrsmtp_send_msg(mrsmtp_t* ths, const clist* recipients, const char* data_not_terminated, size_t data_bytes)
 {
-	int           success = 0, r, smtp_locked = 0;
+	int           success = 0, r;
 	clistiter*    iter;
 
 	if( ths == NULL ) {
@@ -279,8 +263,6 @@ int mrsmtp_send_msg(mrsmtp_t* ths, const clist* recipients, const char* data_not
 		return 1; /* "null message" send */
 	}
 
-	LOCK_SMTP
-
 		if( ths->m_hEtpan==NULL ) {
 			goto cleanup;
 		}
@@ -325,8 +307,6 @@ int mrsmtp_send_msg(mrsmtp_t* ths, const clist* recipients, const char* data_not
 
 cleanup:
 
-	UNLOCK_SMTP
-
 	return success;
 }
 
diff --git a/src/mrsmtp.h b/src/mrsmtp.h
index 6a07daba..32653f2f 100644
--- a/src/mrsmtp.h
+++ b/src/mrsmtp.h
@@ -37,7 +37,6 @@ typedef struct mrsmtp_t
 	mailsmtp*       m_hEtpan;
 	char*           m_from;
 	int             m_esmtp;
-	pthread_mutex_t m_mutex;
 
 	int             m_log_connect_errors;
 	int             m_log_usual_error;