Fix issue #269 for old ESP32 Core SDK (v1.0.6 and older) compilation …

…error due to ambiguous in WiFiClient's setSocketOption.
mobizt · Jul 4, 2023 · 4ddd51a · 4ddd51a
1 parent af0d684
commit 4ddd51a
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 20 deletions.
diff --git a/library.json b/library.json
@@ -1,6 +1,6 @@
 {
   "name": "ESP Mail Client",
-  "version": "3.1.12",
+  "version": "3.1.13",
   "keywords": "communication, email, imap, smtp, esp32, esp8266, samd, arduino",
   "description": "Arduino E-Mail Client Library to send, read and get incoming email notification for ESP32, ESP8266 and SAMD21 devices. The library also supported other Arduino Devices using Clients interfaces e.g. WiFiClient, EthernetClient, and GSMClient.",
   "repository": {

diff --git a/library.properties b/library.properties
@@ -1,6 +1,6 @@
 name=ESP Mail Client
 
-version=3.1.12
+version=3.1.13
 
 author=Mobizt
 

diff --git a/src/ESP_Mail_Client.cpp b/src/ESP_Mail_Client.cpp
@@ -2,7 +2,7 @@
 #define ESP_MAIL_CLIENT_CPP
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Client.h b/src/ESP_Mail_Client.h
@@ -2,7 +2,7 @@
 #define ESP_MAIL_CLIENT_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Client_Version.h b/src/ESP_Mail_Client_Version.h
@@ -3,8 +3,8 @@
 
 #ifndef ESP_MAIL_VERSION
 
-#define ESP_MAIL_VERSION "3.1.12"
-#define ESP_MAIL_VERSION_NUM 30112
+#define ESP_MAIL_VERSION "3.1.13"
+#define ESP_MAIL_VERSION_NUM 30113
 
 /* The inconsistent file version checking to prevent mixed versions compilation. */
 #define VALID_VERSION_CHECK(ver) (ver == ESP_MAIL_VERSION_NUM)

diff --git a/src/ESP_Mail_Const.h b/src/ESP_Mail_Const.h
@@ -6,7 +6,7 @@
 #define ESP_MAIL_CONST_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Error.h b/src/ESP_Mail_Error.h
@@ -7,7 +7,7 @@
 #define ESP_MAIL_ERROR_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_FS.h b/src/ESP_Mail_FS.h
@@ -6,7 +6,7 @@
 #define ESP_MAIL_CONFIG_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_IMAP.h b/src/ESP_Mail_IMAP.h
@@ -3,7 +3,7 @@
 #define ESP_MAIL_IMAP_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_Print.h b/src/ESP_Mail_Print.h
@@ -2,7 +2,7 @@
 #define ESP_MAIL_PRINT_H_
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/ESP_Mail_SMTP.h b/src/ESP_Mail_SMTP.h
@@ -3,7 +3,7 @@
 #define ESP_MAIL_SMTP_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/MB_Time.h b/src/extras/MB_Time.h
@@ -2,7 +2,7 @@
 #define MB_Time_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/RFC2047.cpp b/src/extras/RFC2047.cpp
@@ -2,7 +2,7 @@
 #define RFC2047_CPP
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/extras/RFC2047.h b/src/extras/RFC2047.h
@@ -4,7 +4,7 @@
 #define RFC2047_H
 
 #include "ESP_Mail_Client_Version.h"
-#if !VALID_VERSION_CHECK(30112)
+#if !VALID_VERSION_CHECK(30113)
 #error "Mixed versions compilation."
 #endif
 

diff --git a/src/wcs/esp32/ESP32_WCS.cpp b/src/wcs/esp32/ESP32_WCS.cpp
@@ -1,7 +1,7 @@
 /*
- * ESP32 WiFi Client Secure v2.0.4
+ * ESP32 WiFi Client Secure v2.0.5
  *
- * Created June 17, 2023
+ * Created July 4, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)

diff --git a/src/wcs/esp32/ESP32_WCS.h b/src/wcs/esp32/ESP32_WCS.h
@@ -1,7 +1,7 @@
 /*
- * ESP32 WiFi Client Secure v2.0.4
+ * ESP32 WiFi Client Secure v2.0.5
  *
- * Created June 17, 2023
+ * Created July 4, 2023
  *
  * The MIT License (MIT)
  * Copyright (c) 2023 K. Suwatchai (Mobizt)
@@ -420,7 +420,9 @@ class ESP32_WCS : public ESP_Mail_WCS_CLASS, public TCP_Client_Base
 #if !defined(ENABLE_CUSTOM_CLIENT)
     int setOption(int option, int *value)
     {
-        return reinterpret_cast<WiFiClient *>(_ssl->client)->setSocketOption(IPPROTO_TCP, option, (const void *)value, sizeof(int));
+        // Actually we wish to use setSocketOption directly but it is ambiguous in old ESP32 core v1.0.x.;
+        // Use setOption instead for old core support.
+        return reinterpret_cast<WiFiClient *>(_ssl->client)->setOption(option, value);
     }
 #endif